diff options
| author | bapt <bapt@FreeBSD.org> | 2016-05-10 11:12:31 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2016-05-10 11:12:31 +0000 |
| commit | e77a110d5554c6192b2c7f7bf92c67b250080c71 (patch) | |
| tree | 3ed3feeca2b3017e5923faa7d7069b419a52bfa8 /libexec | |
| parent | 9af4744a94145acbc3cbf6897ed72229f2941569 (diff) | |
| download | FreeBSD-src-e77a110d5554c6192b2c7f7bf92c67b250080c71.zip FreeBSD-src-e77a110d5554c6192b2c7f7bf92c67b250080c71.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 'libexec')
| -rw-r--r-- | libexec/ftpd/extern.h | 2 | ||||
| -rw-r--r-- | libexec/ftpd/ftpcmd.y | 6 | ||||
| -rw-r--r-- | libexec/ftpd/ftpd.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libexec/ftpd/extern.h b/libexec/ftpd/extern.h index 4f16f7b..9d56cb2 100644 --- a/libexec/ftpd/extern.h +++ b/libexec/ftpd/extern.h @@ -42,7 +42,7 @@ void fatalerror(char *); void ftpd_logwtmp(char *, char *, struct sockaddr *addr); int ftpd_pclose(FILE *); FILE *ftpd_popen(char *, char *); -int getline(char *, int, FILE *); +int get_line(char *, int, FILE *); void lreply(int, const char *, ...) __printflike(2, 3); void makedir(char *); void nack(char *); diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y index 94475ec..8d4e3bd 100644 --- a/libexec/ftpd/ftpcmd.y +++ b/libexec/ftpd/ftpcmd.y @@ -1158,10 +1158,10 @@ lookup(struct tab *p, char *cmd) #include <arpa/telnet.h> /* - * getline - a hacked up version of fgets to ignore TELNET escape codes. + * get_line - a hacked up version of fgets to ignore TELNET escape codes. */ int -getline(char *s, int n, FILE *iop) +get_line(char *s, int n, FILE *iop) { int c; register char *cs; @@ -1280,7 +1280,7 @@ yylex(void) case CMD: (void) signal(SIGALRM, toolong); (void) alarm(timeout); - n = getline(cbuf, sizeof(cbuf)-1, stdin); + n = get_line(cbuf, sizeof(cbuf)-1, stdin); if (n == -1) { reply(221, "You could at least say goodbye."); dologout(0); diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index b9c9069..8928493 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -2820,7 +2820,7 @@ myoob(void) return (0); } cp = tmpline; - ret = getline(cp, 7, stdin); + ret = get_line(cp, 7, stdin); if (ret == -1) { reply(221, "You could at least say goodbye."); dologout(0); |
