Cast char* argument to hh_to_c() to Byte*

[openldap] / libraries / libldap / ufn.c

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;