diff options
author | bapt <bapt@FreeBSD.org> | 2016-05-10 11:17:36 +0000 |
---|---|---|
committer | bapt <bapt@FreeBSD.org> | 2016-05-10 11:17:36 +0000 |
commit | 57d2143bfdcb64937a627e72f07ca848e20417e9 (patch) | |
tree | 518ede42169232783b863a4caddd851731df930f /usr.bin | |
parent | c80a45c967a30b0e865e5e6c8f674b2d5566c50b (diff) | |
download | FreeBSD-src-57d2143bfdcb64937a627e72f07ca848e20417e9.zip FreeBSD-src-57d2143bfdcb64937a627e72f07ca848e20417e9.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.bin')
-rw-r--r-- | usr.bin/rs/rs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/rs/rs.c b/usr.bin/rs/rs.c index ba29ef2..3f50868 100644 --- a/usr.bin/rs/rs.c +++ b/usr.bin/rs/rs.c @@ -93,7 +93,7 @@ static int owidth = 80, gutter = 2; static void getargs(int, char *[]); static void getfile(void); -static int getline(void); +static int get_line(void); static char *getlist(short **, char *); static char *getnum(int *, char *, int); static char **getptrs(char **); @@ -133,13 +133,13 @@ getfile(void) char **padto; while (skip--) { - c = getline(); + c = get_line(); if (flags & SKIPPRINT) puts(curline); if (c == EOF) return; } - getline(); + get_line(); if (flags & NOARGS && curlen < owidth) flags |= ONEPERLINE; if (flags & ONEPERLINE) @@ -184,7 +184,7 @@ getfile(void) INCR(ep); } } - } while (getline() != EOF); + } while (get_line() != EOF); *ep = 0; /* mark end of pointers */ nelem = ep - elem; } @@ -333,7 +333,7 @@ prepfile(void) static char ibuf[BSIZE]; static int -getline(void) /* get line; maintain curline, curlen; manage storage */ +get_line(void) /* get line; maintain curline, curlen; manage storage */ { static int putlength; static char *endblock = ibuf + BSIZE; |