diff options
| author | KaoruToda <kunnpuu@gmail.com> | 2017-10-09 20:05:58 +0900 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-10-09 13:17:09 +0100 |
| commit | 208fb891e36f16d20262710c70ef0ff3df0e885c (patch) | |
| tree | 514e6161c7c21122fced736efaddd87f5b5e0538 /ssl/s3_lib.c | |
| parent | 2e8b5d75afaff7c9b75917b750f997dc82336fac (diff) | |
Since return is inconsistent, I removed unnecessary parentheses and
unified them.
- return (0); -> return 0;
- return (1); -> return 1;
- return (-1); -> return -1;
Reviewed-by: Stephen Henson <steve@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4500)
Diffstat (limited to 'ssl/s3_lib.c')
| -rw-r--r-- | ssl/s3_lib.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index a8f5637be5..f603f1c1a3 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3986,7 +3986,7 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) default: return (0); } - return (1); + return 1; } long ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp) (void)) @@ -4038,7 +4038,7 @@ long ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp) (void)) default: return (0); } - return (1); + return 1; } const SSL_CIPHER *ssl3_get_cipher_by_id(uint32_t id) @@ -4310,7 +4310,7 @@ int ssl3_shutdown(SSL *s) */ if (s->quiet_shutdown || SSL_in_before(s)) { s->shutdown = (SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN); - return (1); + return 1; } if (!(s->shutdown & SSL_SENT_SHUTDOWN)) { @@ -4346,7 +4346,7 @@ int ssl3_shutdown(SSL *s) if ((s->shutdown == (SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN)) && !s->s3->alert_dispatch) - return (1); + return 1; else return (0); } @@ -4405,10 +4405,10 @@ int ssl3_peek(SSL *s, void *buf, size_t len, size_t *readbytes) int ssl3_renegotiate(SSL *s) { if (s->handshake_func == NULL) - return (1); + return 1; s->s3->renegotiate = 1; - return (1); + return 1; } /* |