mirror of
https://git.openldap.org/openldap/openldap.git
synced 2026-01-18 12:54:09 -05:00
function pointers are incompatible with void *'; remove != NULL' from tests.
This commit is contained in:
parent
81e7f98e30
commit
eaedc9228b
2 changed files with 4 additions and 4 deletions
|
|
@ -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 ) {
|
||||
|
|
|
|||
|
|
@ -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 );
|
||||
|
|
|
|||
Loading…
Reference in a new issue