function pointers are incompatible with `void *'; remove NULL or replace with 0

diff --git a/libraries/libldap/charset.c b/libraries/libldap/charset.c
index 1f26b9accb760e3fc396336b1286ea0f5ca8a721..b3c835e487796a976bfc26859397679f39a98b78 100644 (file)
--- a/libraries/libldap/charset.c
+++ b/libraries/libldap/charset.c
@@ -56,7 +56,7 @@ int
 ldap_translate_from_t61( LDAP *ld, char **bufp, unsigned long *lenp,
     int free_input )
 {
-       if ( ld->ld_lber_decode_translate_proc == NULL ) {
+       if ( ld->ld_lber_decode_translate_proc == 0 ) {
                return( LDAP_SUCCESS );
        }
            
@@ -68,7 +68,7 @@ int
 ldap_translate_to_t61( LDAP *ld, char **bufp, unsigned long *lenp,
     int free_input )
 {
-       if ( ld->ld_lber_encode_translate_proc == NULL ) {
+       if ( ld->ld_lber_encode_translate_proc == 0 ) {
                return( LDAP_SUCCESS );
        }
            

diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index a9f7dbf0faae882ed3e181caf4ae59f6ae67f0ee..ab00e00986055336f92c2c21c0ba1470c7637479 100644 (file)
--- a/libraries/libldap/request.c
+++ b/libraries/libldap/request.c
@@ -350,7 +350,7 @@ ldap_new_connection( LDAP *ld, LDAPServer **srvlistp, int use_ldsb,
 
                freepasswd = err = 0;
 
-               if ( ld->ld_rebindproc == NULL ) {
+               if ( ld->ld_rebindproc == 0 ) {
                        binddn = passwd = "";
                        authmethod = LDAP_AUTH_SIMPLE;
                } else {

diff --git a/libraries/libldap/ufn.c b/libraries/libldap/ufn.c
index 342bd8a1e94e1068b2374780c5cf84e37d8563cf..f6dc616e750c538926122a2b03327ec55aa2b7ee 100644 (file)
--- a/libraries/libldap/ufn.c
+++ b/libraries/libldap/ufn.c
@@ -46,8 +46,8 @@ static LDAPMessage *ldap_ufn_expand LDAP_P(( LDAP *ld, cancelptype cancelproc,
  *     attrsonly       1 => attributes only 0 => attributes and values
  *     res             will contain the result of the search
  *     cancelproc      routine that returns non-zero if operation should be
- *                     cancelled.  This can be NULL.  If it is non-NULL, the
- *                     routine will be called periodically.
+ *                     cancelled.  This can be a null function pointer.  If
+ *                     it is not 0, the routine will be called periodically.
  *     cancelparm      void * that is passed to cancelproc
  *     tag[123]        the ldapfilter.conf tag that will be used in phases
  *                     1, 2, and 3 of the search, respectively
@@ -427,7 +427,7 @@ ldap_ufn_expand( LDAP *ld, cancelptype cancelproc, void *cancelparm,
 
                do {
                        *err = ldap_result( ld, msgid, 1, &tv, &tmpres );
-                       if ( *err == 0 && cancelproc != NULL &&
+                       if ( *err == 0 && cancelproc != 0 &&
                            (*cancelproc)( cancelparm ) != 0 ) {
                                ldap_abandon( ld, msgid );
                                *err = LDAP_USER_CANCELLED;