diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-05-10 11:12:31 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-05-10 11:12:31 +0000 |
| commit | f03ef8405b0c54ef0febc3fc91d511282e9928f4 (patch) | |
| tree | 3ed3feeca2b3017e5923faa7d7069b419a52bfa8 /usr.bin/gencat | |
| parent | a651f2bc6cb7aa4b3f343bad711cbd08c77ce2e8 (diff) | |
| download | src-f03ef8405b0c54ef0febc3fc91d511282e9928f4.tar.gz src-f03ef8405b0c54ef0febc3fc91d511282e9928f4.zip | |
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
Notes
Notes:
svn path=/head/; revision=299356
Diffstat (limited to 'usr.bin/gencat')
| -rw-r--r-- | usr.bin/gencat/gencat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/gencat/gencat.c b/usr.bin/gencat/gencat.c index 031c27aaa204..6d4098a31f1c 100644 --- a/usr.bin/gencat/gencat.c +++ b/usr.bin/gencat/gencat.c @@ -104,7 +104,7 @@ static long lineno = 0; static char *cskip(char *); static void error(const char *); -static char *getline(int); +static char *get_line(int); static char *getmsg(int, char *, char); static void warning(const char *, const char *); static char *wskip(char *); @@ -231,7 +231,7 @@ xstrdup(const char *str) } static char * -getline(int fd) +get_line(int fd) { static long curlen = BUFSIZ; static char buf[BUFSIZ], *bptr = buf, *bend = buf; @@ -334,7 +334,7 @@ getmsg(int fd, char *cptr, char quote) ++cptr; switch (*cptr) { case '\0': - cptr = getline(fd); + cptr = get_line(fd); if (!cptr) error("premature end of file"); msglen += strlen(cptr); @@ -394,7 +394,7 @@ MCParse(int fd) /* XXX: init sethead? */ - while ((cptr = getline(fd))) { + while ((cptr = get_line(fd))) { if (*cptr == '$') { ++cptr; if (strncmp(cptr, "set", 3) == 0) { |