diff options
| author | KaoruToda <kunnpuu@gmail.com> | 2017-10-17 16:04:09 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-10-18 17:05:06 +0200 |
| commit | 26a7d938c9bf932a55cb5e4e02abb48fe395c5cd (patch) | |
| tree | ce5b1908c181722514aa80d03026c6f42ab85972 /crypto/ui | |
| parent | Add missing RAND_DRBG locking (diff) | |
| download | openssl-26a7d938c9bf932a55cb5e4e02abb48fe395c5cd.tar.xz openssl-26a7d938c9bf932a55cb5e4e02abb48fe395c5cd.zip | |
Remove parentheses of return.
Since return is inconsistent, I removed unnecessary parentheses and
unified them.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4541)
Diffstat (limited to 'crypto/ui')
| -rw-r--r-- | crypto/ui/ui_lib.c | 6 | ||||
| -rw-r--r-- | crypto/ui/ui_openssl.c | 2 | ||||
| -rw-r--r-- | crypto/ui/ui_util.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/crypto/ui/ui_lib.c b/crypto/ui/ui_lib.c index 4727d56b82..98519877f4 100644 --- a/crypto/ui/ui_lib.c +++ b/crypto/ui/ui_lib.c @@ -17,7 +17,7 @@ UI *UI_new(void) { - return (UI_new_method(NULL)); + return UI_new_method(NULL); } UI *UI_new_method(const UI_METHOD *method) @@ -572,12 +572,12 @@ int UI_ctrl(UI *ui, int cmd, long i, void *p, void (*f) (void)) int UI_set_ex_data(UI *r, int idx, void *arg) { - return (CRYPTO_set_ex_data(&r->ex_data, idx, arg)); + return CRYPTO_set_ex_data(&r->ex_data, idx, arg); } void *UI_get_ex_data(UI *r, int idx) { - return (CRYPTO_get_ex_data(&r->ex_data, idx)); + return CRYPTO_get_ex_data(&r->ex_data, idx); } const UI_METHOD *UI_get_method(UI *ui) diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c index 6128425800..c2d9460c39 100644 --- a/crypto/ui/ui_openssl.c +++ b/crypto/ui/ui_openssl.c @@ -687,7 +687,7 @@ static int noecho_fgets(char *buf, int size, FILE *tty) FlushConsoleInputBuffer(inh); } # endif - return (strlen(buf)); + return strlen(buf); } # endif diff --git a/crypto/ui/ui_util.c b/crypto/ui/ui_util.c index 7249a077d8..b379324f9b 100644 --- a/crypto/ui/ui_util.c +++ b/crypto/ui/ui_util.c @@ -25,7 +25,7 @@ int UI_UTIL_read_pw_string(char *buf, int length, const char *prompt, UI_UTIL_read_pw(buf, buff, (length > BUFSIZ) ? BUFSIZ : length, prompt, verify); OPENSSL_cleanse(buff, BUFSIZ); - return (ret); + return ret; } int UI_UTIL_read_pw(char *buf, char *buff, int size, const char *prompt, @@ -48,7 +48,7 @@ int UI_UTIL_read_pw(char *buf, char *buff, int size, const char *prompt, } if (ok > 0) ok = 0; - return (ok); + return ok; } /* |