summaryrefslogtreecommitdiffstats
path: root/usr.sbin/lpr
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2016-05-10 11:12:31 +0000
committerbapt <bapt@FreeBSD.org>2016-05-10 11:12:31 +0000
commite77a110d5554c6192b2c7f7bf92c67b250080c71 (patch)
tree3ed3feeca2b3017e5923faa7d7069b419a52bfa8 /usr.sbin/lpr
parent9af4744a94145acbc3cbf6897ed72229f2941569 (diff)
downloadFreeBSD-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/lpr')
-rw-r--r--usr.sbin/lpr/lpd/printjob.c12
1 files changed, 6 insertions, 6 deletions
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);
/*
OpenPOWER on IntegriCloud