aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorKaoruToda <kunnpuu@gmail.com>2017-10-09 20:05:58 +0900
committerMatt Caswell <matt@openssl.org>2017-10-09 13:17:09 +0100
commit208fb891e36f16d20262710c70ef0ff3df0e885c (patch)
tree514e6161c7c21122fced736efaddd87f5b5e0538 /apps
parent2e8b5d75afaff7c9b75917b750f997dc82336fac (diff)
downloadopenssl-208fb891e36f16d20262710c70ef0ff3df0e885c.tar.gz
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 'apps')
-rw-r--r--apps/apps.c4
-rw-r--r--apps/openssl.c2
-rw-r--r--apps/rehash.c2
-rw-r--r--apps/s_cb.c2
-rw-r--r--apps/s_server.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/apps/apps.c b/apps/apps.c
index 6f93249391..16c99aae5b 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -109,13 +109,13 @@ int chopup_args(ARGS *arg, char *buf)
}
}
arg->argv[arg->argc] = NULL;
- return (1);
+ return 1;
}
#ifndef APP_INIT
int app_init(long mesgwin)
{
- return (1);
+ return 1;
}
#endif
diff --git a/apps/openssl.c b/apps/openssl.c
index 3b347ba11e..402a818a83 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -571,7 +571,7 @@ static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[])
BIO_printf(bio_err, "Invalid command '%s'; type \"help\" for a list.\n",
argv[0]);
- return (1);
+ return 1;
}
static void list_pkey(void)
diff --git a/apps/rehash.c b/apps/rehash.c
index 8bb9a14ef6..c14bce4007 100644
--- a/apps/rehash.c
+++ b/apps/rehash.c
@@ -518,7 +518,7 @@ const OPTIONS rehash_options[] = {
int rehash_main(int argc, char **argv)
{
BIO_printf(bio_err, "Not available; use c_rehash script\n");
- return (1);
+ return 1;
}
#endif /* defined(OPENSSL_SYS_UNIX) || defined(__APPLE__) */
diff --git a/apps/s_cb.c b/apps/s_cb.c
index cb5d18c083..e82d4d036c 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -137,7 +137,7 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
return (0);
}
}
- return (1);
+ return 1;
}
int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key,
diff --git a/apps/s_server.c b/apps/s_server.c
index b22f08311b..ea23d892e7 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2760,7 +2760,7 @@ static int init_ssl_connection(SSL *con)
if ((dtlslisten && i == 0)
|| (!dtlslisten && retry)) {
BIO_printf(bio_s_out, "DELAY\n");
- return (1);
+ return 1;
}
BIO_printf(bio_err, "ERROR\n");