From: Hallvard Furuseth <hallvard@openldap.org>
Date: Wed, 3 Mar 1999 15:57:57 +0000 (+0000)
Subject: function pointers are incompatible with `void *'; remove `!= NULL' from tests.
X-Git-Tag: OPENLDAP_SLAPD_BACK_LDAP~516
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=eaedc9228b091a31b036c5c501a7fef0dd4bd8c4;p=openldap

function pointers are incompatible with `void *'; remove `!= NULL' from tests.
---

diff --git a/libraries/liblber/decode.c b/libraries/liblber/decode.c
index b94c5cf926..bef41fa754 100644
--- a/libraries/liblber/decode.c
+++ b/libraries/liblber/decode.c
@@ -198,7 +198,7 @@ ber_get_stringb( BerElement *ber, char *buf, unsigned long *len )
 
 #ifdef STR_TRANSLATION
 	if ( datalen > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0
-	    && ber->ber_decode_translate_proc != NULL ) {
+	    && ber->ber_decode_translate_proc ) {
 		transbuf = buf;
 		++datalen;
 		if ( (*(ber->ber_decode_translate_proc))( &transbuf, &datalen,
@@ -241,7 +241,7 @@ ber_get_stringa( BerElement *ber, char **buf )
 
 #ifdef STR_TRANSLATION
 	if ( datalen > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0
-	    && ber->ber_decode_translate_proc != NULL ) {
+	    && ber->ber_decode_translate_proc ) {
 		++datalen;
 		if ( (*(ber->ber_decode_translate_proc))( buf, &datalen, 1 )
 		    != 0 ) {
@@ -284,7 +284,7 @@ ber_get_stringal( BerElement *ber, struct berval **bv )
 
 #ifdef STR_TRANSLATION
 	if ( len > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0
-	    && ber->ber_decode_translate_proc != NULL ) {
+	    && ber->ber_decode_translate_proc ) {
 		++len;
 		if ( (*(ber->ber_decode_translate_proc))( &((*bv)->bv_val),
 		    &len, 1 ) != 0 ) {
diff --git a/libraries/liblber/encode.c b/libraries/liblber/encode.c
index 55cde46cc5..c72fb99020 100644
--- a/libraries/liblber/encode.c
+++ b/libraries/liblber/encode.c
@@ -231,7 +231,7 @@ ber_put_ostring( BerElement *ber, char *str, unsigned long len,
 
 #ifdef STR_TRANSLATION
 	if ( len > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0 &&
-	    ber->ber_encode_translate_proc != NULL ) {
+	    ber->ber_encode_translate_proc ) {
 		if ( (*(ber->ber_encode_translate_proc))( &str, &len, 0 )
 		    != 0 ) {
 			return( -1 );