upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-11 01:12:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Hallvard Furuseth 1999-03-03 16:02:00 +00:00
parent eaedc9228b
commit 7bac8381a6
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/libldap/charset.c
View file

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

2
libraries/libldap/request.c
View file

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

6
libraries/libldap/ufn.c
View file

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