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/ui | |
| 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/ui')
| -rw-r--r-- | crypto/ui/ui_lib.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/crypto/ui/ui_lib.c b/crypto/ui/ui_lib.c index 06e6cd849c..d2732f5bf2 100644 --- a/crypto/ui/ui_lib.c +++ b/crypto/ui/ui_lib.c @@ -74,9 +74,8 @@ UI *UI_new(void) UI *UI_new_method(const UI_METHOD *method) { - UI *ret; + UI *ret = OPENSSL_malloc(sizeof(UI)); - ret = (UI *)OPENSSL_malloc(sizeof(UI)); if (ret == NULL) { UIerr(UI_F_UI_NEW_METHOD, ERR_R_MALLOC_FAILURE); return NULL; @@ -142,7 +141,7 @@ static UI_STRING *general_allocate_prompt(UI *ui, const char *prompt, } else if ((type == UIT_PROMPT || type == UIT_VERIFY || type == UIT_BOOLEAN) && result_buf == NULL) { UIerr(UI_F_GENERAL_ALLOCATE_PROMPT, UI_R_NO_RESULT_BUFFER); - } else if ((ret = (UI_STRING *)OPENSSL_malloc(sizeof(UI_STRING)))) { + } else if ((ret = OPENSSL_malloc(sizeof(UI_STRING)))) { ret->out_string = prompt; ret->flags = prompt_freeable ? OUT_STRING_FREEABLE : 0; ret->input_flags = input_flags; @@ -410,7 +409,7 @@ char *UI_construct_prompt(UI *ui, const char *object_desc, len += sizeof(prompt2) - 1 + strlen(object_name); len += sizeof(prompt3) - 1; - prompt = (char *)OPENSSL_malloc(len + 1); + prompt = OPENSSL_malloc(len + 1); if (prompt == NULL) return NULL; BUF_strlcpy(prompt, prompt1, len + 1); @@ -587,7 +586,7 @@ const UI_METHOD *UI_set_method(UI *ui, const UI_METHOD *meth) UI_METHOD *UI_create_method(char *name) { - UI_METHOD *ui_method = (UI_METHOD *)OPENSSL_malloc(sizeof(UI_METHOD)); + UI_METHOD *ui_method = OPENSSL_malloc(sizeof(UI_METHOD)); if (ui_method) { memset(ui_method, 0, sizeof(*ui_method)); |