From: Antonio Quartulli Date: Fri, 11 Aug 2017 09:07:44 +0000 (+0800) Subject: use NULL instead of 0 when assigning pointers X-Git-Tag: v2.5_beta1~619 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=280150a02a117eb0cc9c34e69ebe9ec3f4ded0f4;p=thirdparty%2Fopenvpn.git use NULL instead of 0 when assigning pointers Signed-off-by: Antonio Quartulli Acked-by: Gert Doering Message-Id: <20170811090744.31750-6-a@unstable.cc> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg15204.html Signed-off-by: David Sommerseth --- diff --git a/src/openvpn/ps.c b/src/openvpn/ps.c index 45e24ded8..5136a20c5 100644 --- a/src/openvpn/ps.c +++ b/src/openvpn/ps.c @@ -922,7 +922,7 @@ port_share_open(const char *host, openvpn_close_socket(fd[1]); exit(0); - return 0; /* NOTREACHED */ + return NULL; /* NOTREACHED */ } error: diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c index 26b71743d..597c62d85 100644 --- a/src/openvpn/ssl_openssl.c +++ b/src/openvpn/ssl_openssl.c @@ -705,7 +705,7 @@ tls_ctx_add_extra_certs(struct tls_root_ctx *ctx, BIO *bio) for (;; ) { cert = NULL; - if (!PEM_read_bio_X509(bio, &cert, 0, NULL)) /* takes ownership of cert */ + if (!PEM_read_bio_X509(bio, &cert, NULL, NULL)) /* takes ownership of cert */ { break; } diff --git a/src/openvpn/ssl_verify_openssl.c b/src/openvpn/ssl_verify_openssl.c index ea474955d..2f3b10b9d 100644 --- a/src/openvpn/ssl_verify_openssl.c +++ b/src/openvpn/ssl_verify_openssl.c @@ -202,8 +202,8 @@ extract_x509_field_ssl(X509_NAME *x509, const char *field_name, char *out, { int lastpos = -1; int tmp = -1; - X509_NAME_ENTRY *x509ne = 0; - ASN1_STRING *asn1 = 0; + X509_NAME_ENTRY *x509ne = NULL; + ASN1_STRING *asn1 = NULL; unsigned char *buf = NULL; ASN1_OBJECT *field_name_obj = OBJ_txt2obj(field_name, 0);