X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Ffriendly.c;h=5d4abdabbe22cd60700352bcbbd3ca7b11095c03;hb=005a2f7aec9a9b8bde4c461ad45c9889eb0e9d18;hp=278c729cee01b27570c0fd60f9a2dd21375b3c8b;hpb=c24d932b02e97472a67f7e71e01b3963469e3e77;p=openldap

diff --git a/libraries/libldap/friendly.c b/libraries/libldap/friendly.c
index 278c729cee..5d4abdabbe 100644
--- a/libraries/libldap/friendly.c
+++ b/libraries/libldap/friendly.c
@@ -1,4 +1,9 @@
+/* $OpenLDAP$ */
 /*
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+/*  Portions
  *  Copyright (c) 1990 Regents of the University of Michigan.
  *  All rights reserved.
  *
@@ -7,14 +12,9 @@
 
 #include "portable.h"
 
-#ifndef lint 
-static char copyright[] = "@(#) Copyright (c) 1993 Regents of the University of Michigan.\nAll rights reserved.\n";
-#endif
-
 #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 @@ static char copyright[] = "@(#) Copyright (c) 1993 Regents of the University of
 #include "ldap-int.h"
 
 char *
-ldap_friendly_name( char *filename, char *uname, FriendlyMap **map )
+ldap_friendly_name(
+	LDAP_CONST char *filename,
+	/* LDAP_CONST */ char *uname,
+	LDAPFriendlyMap **map )
 {
 	int	i, entries;
 	FILE	*fp;
@@ -46,8 +49,8 @@ ldap_friendly_name( char *filename, char *uname, FriendlyMap **map )
 		}
 		rewind( fp );
 
-		if ( (*map = (FriendlyMap *) malloc( (entries + 1) *
-		    sizeof(FriendlyMap) )) == NULL ) {
+		if ( (*map = (LDAPFriendlyMap *) LDAP_MALLOC( (entries + 1) *
+		    sizeof(LDAPFriendlyMap) )) == NULL ) {
 			fclose( fp );
 			return( uname );
 		}
@@ -83,37 +86,37 @@ ldap_friendly_name( char *filename, char *uname, FriendlyMap **map )
 				}
 			}
 
-			(*map)[i].f_unfriendly = ldap_strdup( buf );
-			(*map)[i].f_friendly   = ldap_strdup( s );
+			(*map)[i].lf_unfriendly = LDAP_STRDUP( buf );
+			(*map)[i].lf_friendly   = LDAP_STRDUP( s );
 			i++;
 		}
 
 		fclose( fp );
-		(*map)[i].f_unfriendly = NULL;
+		(*map)[i].lf_unfriendly = NULL;
 	}
 
-	for ( i = 0; (*map)[i].f_unfriendly != NULL; i++ ) {
-		if ( strcasecmp( uname, (*map)[i].f_unfriendly ) == 0 )
-			return( (*map)[i].f_friendly );
+	for ( i = 0; (*map)[i].lf_unfriendly != NULL; i++ ) {
+		if ( strcasecmp( uname, (*map)[i].lf_unfriendly ) == 0 )
+			return( (*map)[i].lf_friendly );
 	}
 	return( uname );
 }
 
 
 void
-ldap_free_friendlymap( FriendlyMap **map )
+ldap_free_friendlymap( LDAPFriendlyMap **map )
 {
-	struct friendly* pF = *map;
+	LDAPFriendlyMap* pF = *map;
 
 	if ( pF == NULL )
 		return;
 
-	while ( pF->f_unfriendly )
+	while ( pF->lf_unfriendly )
 	{
-		free( pF->f_unfriendly );
-		free( pF->f_friendly );
+		LDAP_FREE( pF->lf_unfriendly );
+		LDAP_FREE( pF->lf_friendly );
 		pF++;
 	}
-	free( *map );
+	LDAP_FREE( *map );
 	*map = NULL;
 }