From owner-svn-src-head@freebsd.org  Tue May 10 11:35:04 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id AC7E3B35CB0;
 Tue, 10 May 2016 11:35:04 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7EFAE1486;
 Tue, 10 May 2016 11:35:04 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4ABZ36I097992;
 Tue, 10 May 2016 11:35:03 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4ABZ3XY097991;
 Tue, 10 May 2016 11:35:03 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201605101135.u4ABZ3XY097991@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 10 May 2016 11:35:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r299362 - head/sbin/iscontrol
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 May 2016 11:35:04 -0000

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) {