From: Howard Chu <hyc@openldap.org>
Date: Thu, 10 Nov 2005 21:25:01 +0000 (+0000)
Subject: Rename getline to avoid stdio conflict
X-Git-Tag: OPENLDAP_REL_ENG_2_2_MP~45
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a88bfa6a08f36b8b25c878e7843729bdd71dec81;p=openldap

Rename getline to avoid stdio conflict
---

diff --git a/servers/slurpd/config.c b/servers/slurpd/config.c
index 6fe2e4035e..be39480cf5 100644
--- a/servers/slurpd/config.c
+++ b/servers/slurpd/config.c
@@ -58,7 +58,7 @@
 static void	add_replica LDAP_P(( char **, int ));
 static int	parse_replica_line LDAP_P(( char **, int, Ri *));
 static void	parse_line LDAP_P(( char * ));
-static char	*getline LDAP_P(( FILE * ));
+static char	*slurpd_getline LDAP_P(( FILE * ));
 static char	*strtok_quote LDAP_P(( char *, char * ));
 
 int	cargc = 0, cargv_size = 0;
@@ -96,7 +96,7 @@ slurpd_read_config(
     }
 
     lineno = 0;
-    while ( (line = getline( fp )) != NULL ) {
+    while ( (line = slurpd_getline( fp )) != NULL ) {
 	/* skip comments and blank lines */
 	if ( line[0] == '#' || line[0] == '\0' ) {
 	    continue;
@@ -321,7 +321,7 @@ strtok_quote(
  * Get a line of input.
  */
 static char *
-getline(
+slurpd_getline(
     FILE *fp
 )
 {