diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-04-28 15:28:14 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-04-28 15:28:14 -0400 |
| commit | b196e7d936fb377d9c5b305748ac25ff0e53ef6d (patch) | |
| tree | c855f0808899e5e7ef3a704c35f464ca36014964 /crypto/objects | |
| parent | 3e47caff4830d2a117eda15b57a5feab89b846ae (diff) | |
remove malloc casts
Following ANSI C rules, remove the casts from calls to
OPENSSL_malloc and OPENSSL_realloc.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/objects')
| -rw-r--r-- | crypto/objects/o_names.c | 2 | ||||
| -rw-r--r-- | crypto/objects/obj_dat.c | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c index fa8709fa83..1fa6426a4f 100644 --- a/crypto/objects/o_names.c +++ b/crypto/objects/o_names.c @@ -187,7 +187,7 @@ int OBJ_NAME_add(const char *name, int type, const char *data) alias = type & OBJ_NAME_ALIAS; type &= ~OBJ_NAME_ALIAS; - onp = (OBJ_NAME *)OPENSSL_malloc(sizeof(OBJ_NAME)); + onp = OPENSSL_malloc(sizeof(OBJ_NAME)); if (onp == NULL) { /* ERROR */ return (0); diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c index 5c861d1ec2..376169c484 100644 --- a/crypto/objects/obj_dat.c +++ b/crypto/objects/obj_dat.c @@ -255,21 +255,19 @@ int OBJ_add_object(const ASN1_OBJECT *obj) return (0); if ((o = OBJ_dup(obj)) == NULL) goto err; - if (!(ao[ADDED_NID] = (ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)))) + if (!(ao[ADDED_NID] = OPENSSL_malloc(sizeof(ADDED_OBJ)))) goto err2; if ((o->length != 0) && (obj->data != NULL)) if (! - (ao[ADDED_DATA] = (ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)))) + (ao[ADDED_DATA] = OPENSSL_malloc(sizeof(ADDED_OBJ)))) goto err2; if (o->sn != NULL) if (! - (ao[ADDED_SNAME] = - (ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)))) + (ao[ADDED_SNAME] = OPENSSL_malloc(sizeof(ADDED_OBJ)))) goto err2; if (o->ln != NULL) if (! - (ao[ADDED_LNAME] = - (ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)))) + (ao[ADDED_LNAME] = OPENSSL_malloc(sizeof(ADDED_OBJ)))) goto err2; for (i = ADDED_DATA; i <= ADDED_NID; i++) { @@ -450,7 +448,7 @@ ASN1_OBJECT *OBJ_txt2obj(const char *s, int no_name) /* Work out total size */ j = ASN1_object_size(0, i, V_ASN1_OBJECT); - if ((buf = (unsigned char *)OPENSSL_malloc(j)) == NULL) + if ((buf = OPENSSL_malloc(j)) == NULL) return NULL; p = buf; @@ -766,7 +764,7 @@ int OBJ_create(const char *oid, const char *sn, const char *ln) if (i <= 0) return (0); - if ((buf = (unsigned char *)OPENSSL_malloc(i)) == NULL) { + if ((buf = OPENSSL_malloc(i)) == NULL) { OBJerr(OBJ_F_OBJ_CREATE, ERR_R_MALLOC_FAILURE); return (0); } |