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/dso | |
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/dso')
-rw-r--r-- | crypto/dso/dso_dl.c | 6 | ||||
-rw-r--r-- | crypto/dso/dso_dlfcn.c | 6 | ||||
-rw-r--r-- | crypto/dso/dso_lib.c | 4 | ||||
-rw-r--r-- | crypto/dso/dso_vms.c | 6 | ||||
-rw-r--r-- | crypto/dso/dso_win32.c | 6 |
5 files changed, 14 insertions, 14 deletions
diff --git a/crypto/dso/dso_dl.c b/crypto/dso/dso_dl.c index d80bf562c7..91f703079e 100644 --- a/crypto/dso/dso_dl.c +++ b/crypto/dso/dso_dl.c @@ -83,7 +83,7 @@ static int dl_load(DSO *dso) * (it also serves as the indicator that we are currently loaded). */ dso->loaded_filename = filename; - return (1); + return 1; err: /* Cleanup! */ OPENSSL_free(filename); @@ -100,7 +100,7 @@ static int dl_unload(DSO *dso) return (0); } if (sk_num(dso->meth_data) < 1) - return (1); + return 1; /* Is this statement legal? */ ptr = (shl_t) sk_pop(dso->meth_data); if (ptr == NULL) { @@ -112,7 +112,7 @@ static int dl_unload(DSO *dso) return (0); } shl_unload(ptr); - return (1); + return 1; } static DSO_FUNC_TYPE dl_bind_func(DSO *dso, const char *symname) diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c index a4b0cdd95b..1b81d686aa 100644 --- a/crypto/dso/dso_dlfcn.c +++ b/crypto/dso/dso_dlfcn.c @@ -120,7 +120,7 @@ static int dlfcn_load(DSO *dso) } /* Success */ dso->loaded_filename = filename; - return (1); + return 1; err: /* Cleanup! */ OPENSSL_free(filename); @@ -137,7 +137,7 @@ static int dlfcn_unload(DSO *dso) return (0); } if (sk_void_num(dso->meth_data) < 1) - return (1); + return 1; ptr = sk_void_pop(dso->meth_data); if (ptr == NULL) { DSOerr(DSO_F_DLFCN_UNLOAD, DSO_R_NULL_HANDLE); @@ -149,7 +149,7 @@ static int dlfcn_unload(DSO *dso) } /* For now I'm not aware of any errors associated with dlclose() */ dlclose(ptr); - return (1); + return 1; } static DSO_FUNC_TYPE dlfcn_bind_func(DSO *dso, const char *symname) diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c index 3c83ab8e91..007d40b6be 100644 --- a/crypto/dso/dso_lib.c +++ b/crypto/dso/dso_lib.c @@ -64,7 +64,7 @@ int DSO_free(DSO *dso) int i; if (dso == NULL) - return (1); + return 1; if (CRYPTO_DOWN_REF(&dso->references, &i, dso->lock) <= 0) return 0; @@ -257,7 +257,7 @@ int DSO_set_filename(DSO *dso, const char *filename) } OPENSSL_free(dso->filename); dso->filename = copied; - return (1); + return 1; } char *DSO_merge(DSO *dso, const char *filespec1, const char *filespec2) diff --git a/crypto/dso/dso_vms.c b/crypto/dso/dso_vms.c index e3c157bf57..cb320179dd 100644 --- a/crypto/dso/dso_vms.c +++ b/crypto/dso/dso_vms.c @@ -207,7 +207,7 @@ static int vms_load(DSO *dso) /* Success (for now, we lie. We actually do not know...) */ dso->loaded_filename = filename; - return (1); + return 1; err: /* Cleanup! */ OPENSSL_free(p); @@ -228,7 +228,7 @@ static int vms_unload(DSO *dso) return (0); } if (sk_void_num(dso->meth_data) < 1) - return (1); + return 1; p = (DSO_VMS_INTERNAL *)sk_void_pop(dso->meth_data); if (p == NULL) { DSOerr(DSO_F_VMS_UNLOAD, DSO_R_NULL_HANDLE); @@ -236,7 +236,7 @@ static int vms_unload(DSO *dso) } /* Cleanup */ OPENSSL_free(p); - return (1); + return 1; } /* diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c index 5f50774bb8..f3aadc699e 100644 --- a/crypto/dso/dso_win32.c +++ b/crypto/dso/dso_win32.c @@ -120,7 +120,7 @@ static int win32_load(DSO *dso) } /* Success */ dso->loaded_filename = filename; - return (1); + return 1; err: /* Cleanup ! */ OPENSSL_free(filename); @@ -138,7 +138,7 @@ static int win32_unload(DSO *dso) return (0); } if (sk_void_num(dso->meth_data) < 1) - return (1); + return 1; p = sk_void_pop(dso->meth_data); if (p == NULL) { DSOerr(DSO_F_WIN32_UNLOAD, DSO_R_NULL_HANDLE); @@ -154,7 +154,7 @@ static int win32_unload(DSO *dso) } /* Cleanup */ OPENSSL_free(p); - return (1); + return 1; } static DSO_FUNC_TYPE win32_bind_func(DSO *dso, const char *symname) |