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

diff --git a/libraries/liblber/decode.c b/libraries/liblber/decode.c
index b94c5cf92612f240cad651f85d0de00449ed2500..bef41fa7540ac08061d28b64ef95e0f37b825492 100644 (file)
--- 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 55cde46cc5c645c48b201a3628d55f34b5c09254..c72fb990201ee8355026f2d6162c6a0c7e9b70d6 100644 (file)
--- 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 );