rename ldap_pvt_init_utils() to ldap_int_utils_init() and provide

[openldap] / libraries / libldap / friendly.c

diff --git a/libraries/libldap/friendly.c b/libraries/libldap/friendly.c
index c07db1bd12187edc6a972f1e68374c03186e0177..9c7b966844dd0d777d9fbb9ea5f73f39b81a33c0 100644 (file)
--- a/libraries/libldap/friendly.c
+++ b/libraries/libldap/friendly.c
@@ -1,4 +1,8 @@
 /*
+ * Copyright 1998-1999 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,10 +11,6 @@
 
 #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>
 
@@ -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, LDAPFriendlyMap **map )
+ldap_friendly_name(
+       LDAP_CONST char *filename,
+       /* LDAP_CONST */ char *uname,
+       LDAPFriendlyMap **map )
 {
        int     i, entries;
        FILE    *fp;
@@ -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 = strdup( buf );
+                       (*map)[i].lf_friendly   = strdup( s );
                        i++;
                }