summaryrefslogtreecommitdiffstats
path: root/sbin
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2016-05-10 11:35:03 +0000
committerbapt <bapt@FreeBSD.org>2016-05-10 11:35:03 +0000
commit8f8b9c58e70092d364b2b817b1a10e9f5c1ef2fa (patch)
tree79a2c8bba9a41f42bd0fd126a55545c01ee2e9bd /sbin
parentd08b8ba7c074411982dfede83572f57b709b88a3 (diff)
downloadFreeBSD-src-8f8b9c58e70092d364b2b817b1a10e9f5c1ef2fa.zip
FreeBSD-src-8f8b9c58e70092d364b2b817b1a10e9f5c1ef2fa.tar.gz
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
Diffstat (limited to 'sbin')
-rw-r--r--sbin/iscontrol/config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/iscontrol/config.c b/sbin/iscontrol/config.c
index e8fd309..639a702 100644
--- a/sbin/iscontrol/config.c
+++ b/sbin/iscontrol/config.c
@@ -210,7 +210,7 @@ setOption(isc_opt_t *op, int which, void *rval)
}
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, int *nargs)
else
len = 0;
state = 0;
- while((lp = getline(fd)) != NULL) {
+ while((lp = get_line(fd)) != NULL) {
for(; isspace((unsigned char)*lp); lp++)
;
switch(state) {
OpenPOWER on IntegriCloud