svn commit: r299362 - head/sbin/iscontrol

[Baptiste Daroussin]

Author: bapt
Date: Tue May 10 11:35:03 2016
New Revision: 299362
URL: https://svnweb.freebsd.org/changeset/base/299362

Log:
  Rename getline with get_line to avoid collision with getline(3)
  
  When getline(3) in 2009 was added a _WITH_GETLINE guard has also been added.
  This rename is made in preparation for the removal of this guard

Modified:
  head/sbin/iscontrol/config.c

Modified: head/sbin/iscontrol/config.c
==============================================================================
--- head/sbin/iscontrol/config.c	Tue May 10 11:34:22 2016	(r299361)
+++ head/sbin/iscontrol/config.c	Tue May 10 11:35:03 2016	(r299362)
@@ -210,7 +210,7 @@ setOption(isc_opt_t *op, int which, void
 }
 
 static char *
-getline(FILE *fd)
+get_line(FILE *fd)
 {
      static char	*sp, line[BUFSIZ];
      char		*lp, *p;
@@ -248,7 +248,7 @@ getConfig(FILE *fd, char *key, char **Ar
      else
 	  len = 0;
      state = 0;
-     while((lp = getline(fd)) != NULL) {
+     while((lp = get_line(fd)) != NULL) {
 	  for(; isspace((unsigned char)*lp); lp++)
 	       ;
 	  switch(state) {