Date: Tue, 10 May 2016 11:17:36 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r299358 - head/usr.bin/rs Message-ID: <201605101117.u4ABHaqW091982@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Tue May 10 11:17:36 2016 New Revision: 299358 URL: https://svnweb.freebsd.org/changeset/base/299358 Log: 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 Modified: head/usr.bin/rs/rs.c Modified: head/usr.bin/rs/rs.c ============================================================================== --- head/usr.bin/rs/rs.c Tue May 10 11:17:19 2016 (r299357) +++ head/usr.bin/rs/rs.c Tue May 10 11:17:36 2016 (r299358) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605101117.u4ABHaqW091982>