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 /usr.sbin | |
| 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 'usr.sbin')
| -rw-r--r-- | usr.sbin/inetd/builtins.c | 6 | ||||
| -rw-r--r-- | usr.sbin/lpr/lpd/printjob.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/usr.sbin/inetd/builtins.c b/usr.sbin/inetd/builtins.c index 3ccdab0..d75a5e4 100644 --- a/usr.sbin/inetd/builtins.c +++ b/usr.sbin/inetd/builtins.c @@ -60,7 +60,7 @@ void discard_dg(int, struct servtab *); void discard_stream(int, struct servtab *); void echo_dg(int, struct servtab *); void echo_stream(int, struct servtab *); -static int getline(int, char *, int); +static int get_line(int, char *, int); void iderror(int, int, int, const char *); void ident_stream(int, struct servtab *); void initring(void); @@ -740,7 +740,7 @@ machtime_stream(int s, struct servtab *sep __unused) #define strwrite(fd, buf) (void) write(fd, buf, sizeof(buf)-1) static int /* # of characters up to \r,\n or \0 */ -getline(int fd, char *buf, int len) +get_line(int fd, char *buf, int len) { int count = 0, n; struct sigaction sa; @@ -775,7 +775,7 @@ tcpmux(int s) int len; /* Get requested service name */ - if ((len = getline(s, service, MAX_SERV_LEN)) < 0) { + if ((len = get_line(s, service, MAX_SERV_LEN)) < 0) { strwrite(s, "-Error reading service name\r\n"); return (NULL); } diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c index b388b96..a2d61c3 100644 --- a/usr.sbin/lpr/lpd/printjob.c +++ b/usr.sbin/lpr/lpd/printjob.c @@ -447,12 +447,12 @@ printit(struct printer *pp, char *file) * M -- "mail" to user when done printing * Z -- "locale" for pr * - * getline reads a line and expands tabs to blanks + * get_line reads a line and expands tabs to blanks */ /* pass 1 */ - while (getline(cfp)) + while (get_line(cfp)) switch (line[0]) { case 'H': strlcpy(origin_host, line + 1, sizeof(origin_host)); @@ -577,7 +577,7 @@ printit(struct printer *pp, char *file) pass2: fseek(cfp, 0L, 0); - while (getline(cfp)) + while (get_line(cfp)) switch (line[0]) { case 'L': /* identification line */ if (!pp->no_header && pp->header_last) @@ -922,7 +922,7 @@ sendit(struct printer *pp, char *file) * pass 1 */ err = OK; - while (getline(cfp)) { + while (get_line(cfp)) { again: if (line[0] == 'S') { cp = line+1; @@ -954,7 +954,7 @@ sendit(struct printer *pp, char *file) } else if (line[0] >= 'a' && line[0] <= 'z') { dfcopies = 1; strcpy(last, line); - while ((i = getline(cfp)) != 0) { + while ((i = get_line(cfp)) != 0) { if (strcmp(last, line) != 0) break; dfcopies++; @@ -983,7 +983,7 @@ sendit(struct printer *pp, char *file) * pass 2 */ fseek(cfp, 0L, 0); - while (getline(cfp)) + while (get_line(cfp)) if (line[0] == 'U' && !strchr(line+1, '/')) (void) unlink(line+1); /* |
