From: Hallvard Furuseth <hallvard@openldap.org>
Date: Tue, 13 Jul 1999 06:37:19 +0000 (+0000)
Subject: Fix NULLxxx -> NULL
X-Git-Tag: OPENLDAP_REL_ENG_2_BP~166
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c4a13efbeae97931a65eeb338ad80410c86929b6;p=openldap

Fix NULLxxx -> NULL
---

diff --git a/libraries/libldap/charset.c b/libraries/libldap/charset.c
index 75c30ff9d9..be85707a83 100644
--- a/libraries/libldap/charset.c
+++ b/libraries/libldap/charset.c
@@ -42,7 +42,7 @@ ldap_enable_translation( LDAP *ld, LDAPMessage *entry, int enable )
 {
 	short	*optionsp;
 
-	optionsp = ( entry == NULLMSG ) ? &ld->ld_lberoptions :
+	optionsp = ( entry == NULL ) ? &ld->ld_lberoptions :
 	    &entry->lm_ber->ber_options;
 		
 	if ( enable ) {
diff --git a/servers/slapd/tools/ldapsyntax.c b/servers/slapd/tools/ldapsyntax.c
index 542792b231..a8fd9fab3a 100644
--- a/servers/slapd/tools/ldapsyntax.c
+++ b/servers/slapd/tools/ldapsyntax.c
@@ -414,7 +414,7 @@ photo2ldif( PS ps, AttributeValue av )
     if ( pe->pe_class == PE_CLASS_UNIV && pe->pe_form == PE_FORM_PRIM
 	    && pe->pe_id == PE_PRIM_BITS ) {
 	len = ps_get_abs( pe );
-	if (( phber = der_alloc()) == NULLBER ) {
+	if (( phber = der_alloc()) == NULL ) {
 	    return( -1 );
 	}
 	if ( ber_printf( phber, "t{[tB]{B}}",