From: Hallvard Furuseth <hallvard@openldap.org>
Date: Wed, 3 Mar 1999 16:02:00 +0000 (+0000)
Subject: function pointers are incompatible with `void *'; remove NULL or replace with 0
X-Git-Tag: OPENLDAP_SLAPD_BACK_LDAP~515
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7bac8381a6514aa4cb00d3dc33fc5e4618f65e44;p=openldap

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 1f26b9accb..b3c835e487 100644
--- 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 a9f7dbf0fa..ab00e00986 100644
--- 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 342bd8a1e9..f6dc616e75 100644
--- 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;