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 /crypto/bio | |
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 'crypto/bio')
-rw-r--r-- | crypto/bio/b_sock.c | 2 | ||||
-rw-r--r-- | crypto/bio/bf_buff.c | 4 | ||||
-rw-r--r-- | crypto/bio/bf_lbuf.c | 4 | ||||
-rw-r--r-- | crypto/bio/bf_nbio.c | 4 | ||||
-rw-r--r-- | crypto/bio/bf_null.c | 4 | ||||
-rw-r--r-- | crypto/bio/bss_acpt.c | 4 | ||||
-rw-r--r-- | crypto/bio/bss_conn.c | 4 | ||||
-rw-r--r-- | crypto/bio/bss_dgram.c | 12 | ||||
-rw-r--r-- | crypto/bio/bss_fd.c | 6 | ||||
-rw-r--r-- | crypto/bio/bss_log.c | 4 | ||||
-rw-r--r-- | crypto/bio/bss_mem.c | 2 | ||||
-rw-r--r-- | crypto/bio/bss_null.c | 4 | ||||
-rw-r--r-- | crypto/bio/bss_sock.c | 6 |
13 files changed, 30 insertions, 30 deletions
diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c index 65339629f8..270d1a5966 100644 --- a/crypto/bio/b_sock.c +++ b/crypto/bio/b_sock.c @@ -153,7 +153,7 @@ int BIO_sock_init(void) return (-1); # endif - return (1); + return 1; } void bio_sock_cleanup_int(void) diff --git a/crypto/bio/bf_buff.c b/crypto/bio/bf_buff.c index 255a4d476e..0b3fe5f104 100644 --- a/crypto/bio/bf_buff.c +++ b/crypto/bio/bf_buff.c @@ -67,7 +67,7 @@ static int buffer_new(BIO *bi) bi->init = 1; bi->ptr = (char *)ctx; bi->flags = 0; - return (1); + return 1; } static int buffer_free(BIO *a) @@ -83,7 +83,7 @@ static int buffer_free(BIO *a) a->ptr = NULL; a->init = 0; a->flags = 0; - return (1); + return 1; } static int buffer_read(BIO *b, char *out, int outl) diff --git a/crypto/bio/bf_lbuf.c b/crypto/bio/bf_lbuf.c index 0cee526bfd..742271fdca 100644 --- a/crypto/bio/bf_lbuf.c +++ b/crypto/bio/bf_lbuf.c @@ -73,7 +73,7 @@ static int linebuffer_new(BIO *bi) bi->init = 1; bi->ptr = (char *)ctx; bi->flags = 0; - return (1); + return 1; } static int linebuffer_free(BIO *a) @@ -88,7 +88,7 @@ static int linebuffer_free(BIO *a) a->ptr = NULL; a->init = 0; a->flags = 0; - return (1); + return 1; } static int linebuffer_read(BIO *b, char *out, int outl) diff --git a/crypto/bio/bf_nbio.c b/crypto/bio/bf_nbio.c index 1d98a942f3..455cdde1c5 100644 --- a/crypto/bio/bf_nbio.c +++ b/crypto/bio/bf_nbio.c @@ -63,7 +63,7 @@ static int nbiof_new(BIO *bi) nt->lwn = -1; bi->ptr = (char *)nt; bi->init = 1; - return (1); + return 1; } static int nbiof_free(BIO *a) @@ -74,7 +74,7 @@ static int nbiof_free(BIO *a) a->ptr = NULL; a->init = 0; a->flags = 0; - return (1); + return 1; } static int nbiof_read(BIO *b, char *out, int outl) diff --git a/crypto/bio/bf_null.c b/crypto/bio/bf_null.c index ff2a04ccd8..fb1e9c26ff 100644 --- a/crypto/bio/bf_null.c +++ b/crypto/bio/bf_null.c @@ -51,7 +51,7 @@ static int nullf_new(BIO *bi) bi->init = 1; bi->ptr = NULL; bi->flags = 0; - return (1); + return 1; } static int nullf_free(BIO *a) @@ -63,7 +63,7 @@ static int nullf_free(BIO *a) a->init=0; a->flags=0; */ - return (1); + return 1; } static int nullf_read(BIO *b, char *out, int outl) diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c index dda637db7f..ecb115762e 100644 --- a/crypto/bio/bss_acpt.c +++ b/crypto/bio/bss_acpt.c @@ -85,7 +85,7 @@ static int acpt_new(BIO *bi) bi->ptr = (char *)ba; ba->state = ACPT_S_BEFORE; bi->shutdown = 1; - return (1); + return 1; } static BIO_ACCEPT *BIO_ACCEPT_new(void) @@ -143,7 +143,7 @@ static int acpt_free(BIO *a) a->flags = 0; a->init = 0; } - return (1); + return 1; } static int acpt_state(BIO *b, BIO_ACCEPT *c) diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c index 5562efaa3b..7c6c9a45df 100644 --- a/crypto/bio/bss_conn.c +++ b/crypto/bio/bss_conn.c @@ -254,7 +254,7 @@ static int conn_new(BIO *bi) if ((bi->ptr = (char *)BIO_CONNECT_new()) == NULL) return (0); else - return (1); + return 1; } static void conn_close_socket(BIO *bio) @@ -286,7 +286,7 @@ static int conn_free(BIO *a) a->flags = 0; a->init = 0; } - return (1); + return 1; } static int conn_read(BIO *b, char *out, int outl) diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c index f886b07333..28fc7a50d5 100644 --- a/crypto/bio/bss_dgram.c +++ b/crypto/bio/bss_dgram.c @@ -157,7 +157,7 @@ static int dgram_new(BIO *bi) if (data == NULL) return 0; bi->ptr = data; - return (1); + return 1; } static int dgram_free(BIO *a) @@ -172,7 +172,7 @@ static int dgram_free(BIO *a) data = (bio_dgram_data *)a->ptr; OPENSSL_free(data); - return (1); + return 1; } static int dgram_clear(BIO *a) @@ -186,7 +186,7 @@ static int dgram_clear(BIO *a) a->init = 0; a->flags = 0; } - return (1); + return 1; } static void dgram_adjust_rcv_timeout(BIO *b) @@ -969,7 +969,7 @@ static int dgram_sctp_new(BIO *bi) bi->ptr = data; bi->flags = 0; - return (1); + return 1; } static int dgram_sctp_free(BIO *a) @@ -985,7 +985,7 @@ static int dgram_sctp_free(BIO *a) if (data != NULL) OPENSSL_free(data); - return (1); + return 1; } # ifdef SCTP_AUTHENTICATION_EVENT @@ -1895,7 +1895,7 @@ int BIO_dgram_non_fatal_error(int err) case EALREADY: # endif - return (1); + return 1; default: break; } diff --git a/crypto/bio/bss_fd.c b/crypto/bio/bss_fd.c index 2a9a0422a2..9fcaaa60d9 100644 --- a/crypto/bio/bss_fd.c +++ b/crypto/bio/bss_fd.c @@ -94,7 +94,7 @@ static int fd_new(BIO *bi) bi->num = -1; bi->ptr = NULL; bi->flags = BIO_FLAGS_UPLINK; /* essentially redundant */ - return (1); + return 1; } static int fd_free(BIO *a) @@ -108,7 +108,7 @@ static int fd_free(BIO *a) a->init = 0; a->flags = BIO_FLAGS_UPLINK; } - return (1); + return 1; } static int fd_read(BIO *b, char *out, int outl) @@ -270,7 +270,7 @@ int BIO_fd_non_fatal_error(int err) # ifdef EALREADY case EALREADY: # endif - return (1); + return 1; default: break; } diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c index 963371ed25..181ab9c58f 100644 --- a/crypto/bio/bss_log.c +++ b/crypto/bio/bss_log.c @@ -110,7 +110,7 @@ static int slg_new(BIO *bi) bi->num = 0; bi->ptr = NULL; xopenlog(bi, "application", LOG_DAEMON); - return (1); + return 1; } static int slg_free(BIO *a) @@ -118,7 +118,7 @@ static int slg_free(BIO *a) if (a == NULL) return (0); xcloselog(a); - return (1); + return 1; } static int slg_write(BIO *b, const char *in, int inl) diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c index 38ffb1025d..49ac1da024 100644 --- a/crypto/bio/bss_mem.c +++ b/crypto/bio/bss_mem.c @@ -165,7 +165,7 @@ static int mem_buf_free(BIO *a, int free_all) a->ptr = NULL; } } - return (1); + return 1; } /* diff --git a/crypto/bio/bss_null.c b/crypto/bio/bss_null.c index d197a609bd..14964d3985 100644 --- a/crypto/bio/bss_null.c +++ b/crypto/bio/bss_null.c @@ -46,14 +46,14 @@ static int null_new(BIO *bi) bi->init = 1; bi->num = 0; bi->ptr = (NULL); - return (1); + return 1; } static int null_free(BIO *a) { if (a == NULL) return (0); - return (1); + return 1; } static int null_read(BIO *b, char *out, int outl) diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c index 71be1cde83..6ff0f663ed 100644 --- a/crypto/bio/bss_sock.c +++ b/crypto/bio/bss_sock.c @@ -73,7 +73,7 @@ static int sock_new(BIO *bi) bi->num = 0; bi->ptr = NULL; bi->flags = 0; - return (1); + return 1; } static int sock_free(BIO *a) @@ -87,7 +87,7 @@ static int sock_free(BIO *a) a->init = 0; a->flags = 0; } - return (1); + return 1; } static int sock_read(BIO *b, char *out, int outl) @@ -223,7 +223,7 @@ int BIO_sock_non_fatal_error(int err) # ifdef EALREADY case EALREADY: # endif - return (1); + return 1; default: break; } |