talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Baptiste Daroussin 2016-05-10 11:17:36 +00:00
parent a9c48188b8
commit 68dd67a27b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.bin/rs/rs.c
View File

@ -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;