X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=libraries%2Flibldap%2Ffriendly.c;h=5d4abdabbe22cd60700352bcbbd3ca7b11095c03;hb=f42966f9e1ac239213e236b93375559a1e25ba5f;hp=5a5567dfee844008c72c21005d8880fb9933e204;hpb=4d2761a6a64eaa1c4d5f7949277ecfe25b42ca83;p=openldap

diff --git a/libraries/libldap/friendly.c b/libraries/libldap/friendly.c
index 5a5567dfee..5d4abdabbe 100644
--- a/libraries/libldap/friendly.c
+++ b/libraries/libldap/friendly.c
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -12,9 +13,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/errno.h>
 #include <ac/socket.h>
 #include <ac/string.h>
@@ -23,7 +23,10 @@
 #include "ldap-int.h"
 
 char *
-ldap_friendly_name( char *filename, char *uname, LDAPFriendlyMap **map )
+ldap_friendly_name(
+	LDAP_CONST char *filename,
+	/* LDAP_CONST */ char *uname,
+	LDAPFriendlyMap **map )
 {
 	int	i, entries;
 	FILE	*fp;
@@ -46,7 +49,7 @@ ldap_friendly_name( char *filename, char *uname, LDAPFriendlyMap **map )
 		}
 		rewind( fp );
 
-		if ( (*map = (LDAPFriendlyMap *) malloc( (entries + 1) *
+		if ( (*map = (LDAPFriendlyMap *) LDAP_MALLOC( (entries + 1) *
 		    sizeof(LDAPFriendlyMap) )) == NULL ) {
 			fclose( fp );
 			return( uname );
@@ -83,8 +86,8 @@ ldap_friendly_name( char *filename, char *uname, LDAPFriendlyMap **map )
 				}
 			}
 
-			(*map)[i].lf_unfriendly = ldap_strdup( buf );
-			(*map)[i].lf_friendly   = ldap_strdup( s );
+			(*map)[i].lf_unfriendly = LDAP_STRDUP( buf );
+			(*map)[i].lf_friendly   = LDAP_STRDUP( s );
 			i++;
 		}
 
@@ -110,10 +113,10 @@ ldap_free_friendlymap( LDAPFriendlyMap **map )
 
 	while ( pF->lf_unfriendly )
 	{
-		free( pF->lf_unfriendly );
-		free( pF->lf_friendly );
+		LDAP_FREE( pF->lf_unfriendly );
+		LDAP_FREE( pF->lf_friendly );
 		pF++;
 	}
-	free( *map );
+	LDAP_FREE( *map );
 	*map = NULL;
 }