From: Matt Caswell Date: Mon, 22 May 2017 11:33:29 +0000 (+0100) Subject: Fix some style issues in returns X-Git-Tag: OpenSSL_1_1_1-pre1~1458 X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=a89325e41f52b4a1f58202f6d8f5597105fc9f5a Fix some style issues in returns Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/3496) --- diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c index eb6a0f8295..448b2eb1d4 100644 --- a/ssl/d1_lib.c +++ b/ssl/d1_lib.c @@ -79,10 +79,10 @@ int dtls1_new(SSL *s) } if (!ssl3_new(s)) - return (0); + return 0; if ((d1 = OPENSSL_zalloc(sizeof(*d1))) == NULL) { ssl3_free(s); - return (0); + return 0; } d1->buffered_messages = pqueue_new(); @@ -100,12 +100,12 @@ int dtls1_new(SSL *s) pqueue_free(d1->sent_messages); OPENSSL_free(d1); ssl3_free(s); - return (0); + return 0; } s->d1 = d1; s->method->ssl_clear(s); - return (1); + return 1; } static void dtls1_clear_queues(SSL *s) diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 289dc51cb2..5a8f9f46ac 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -2915,9 +2915,9 @@ int ssl3_new(SSL *s) goto err; #endif s->method->ssl_clear(s); - return (1); + return 1; err: - return (0); + return 0; } void ssl3_free(SSL *s) diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index b318055eab..cba03bdc15 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -443,7 +443,7 @@ int SSL_clear(SSL *s) { if (s->method == NULL) { SSLerr(SSL_F_SSL_CLEAR, SSL_R_NO_METHOD_SPECIFIED); - return (0); + return 0; } if (ssl_clear_bad_session(s)) { @@ -492,13 +492,13 @@ int SSL_clear(SSL *s) s->method->ssl_free(s); s->method = s->ctx->method; if (!s->method->ssl_new(s)) - return (0); + return 0; } else s->method->ssl_clear(s); RECORD_LAYER_clear(&s->rlayer); - return (1); + return 1; } /** Used to change an SSL_CTXs default SSL method type */