projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Explicitly test against NULL; do not use !p or similar
[openssl.git]
/
ssl
/
ssl_conf.c
diff --git
a/ssl/ssl_conf.c
b/ssl/ssl_conf.c
index 9ce1e187c47c188bb3942e8d2f3b32691f7dfafd..40db39b2e1c51bb1372179a94dd93f262f216be4 100644
(file)
--- a/
ssl/ssl_conf.c
+++ b/
ssl/ssl_conf.c
@@
-427,7
+427,7
@@
static int cmd_Certificate(SSL_CONF_CTX *cctx, const char *value)
char **pfilename = &cctx->cert_filename[c->key - c->pkeys];
OPENSSL_free(*pfilename);
*pfilename = OPENSSL_strdup(value);
char **pfilename = &cctx->cert_filename[c->key - c->pkeys];
OPENSSL_free(*pfilename);
*pfilename = OPENSSL_strdup(value);
- if (
!*pfilename
)
+ if (
*pfilename == NULL
)
rv = 0;
}
rv = 0;
}
@@
-712,7
+712,7
@@
static const ssl_switch_tbl ssl_cmd_switches[] = {
static int ssl_conf_cmd_skip_prefix(SSL_CONF_CTX *cctx, const char **pcmd)
{
static int ssl_conf_cmd_skip_prefix(SSL_CONF_CTX *cctx, const char **pcmd)
{
- if (
!pcmd || !*pcmd
)
+ if (
pcmd == NULL || *pcmd == NULL
)
return 0;
/* If a prefix is set, check and skip */
if (cctx->prefix) {
return 0;
/* If a prefix is set, check and skip */
if (cctx->prefix) {
@@
-830,13
+830,14
@@
int SSL_CONF_cmd_argv(SSL_CONF_CTX *cctx, int *pargc, char ***pargv)
{
int rv;
const char *arg = NULL, *argn;
{
int rv;
const char *arg = NULL, *argn;
- if (pargc && *pargc == 0)
+
+ if (pargc != NULL && *pargc == 0)
return 0;
return 0;
- if (
!pargc
|| *pargc > 0)
+ if (
pargc == NULL
|| *pargc > 0)
arg = **pargv;
if (arg == NULL)
return 0;
arg = **pargv;
if (arg == NULL)
return 0;
- if (
!pargc
|| *pargc > 1)
+ if (
pargc == NULL
|| *pargc > 1)
argn = (*pargv)[1];
else
argn = NULL;
argn = (*pargv)[1];
else
argn = NULL;