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

This commit is contained in:
Hallvard Furuseth 1999-03-03 15:57:57 +00:00
parent 81e7f98e30
commit eaedc9228b
2 changed files with 4 additions and 4 deletions

View file

@ -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 ) {

View file

@ -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 );