d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename getline with get_line to avoid collision with getline(3)

Browse Source 
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

Obtained from:	OpenBSD
This commit is contained in:
Baptiste Daroussin 2016-05-10 11:09:26 +00:00
parent 084d207584
commit 053a88680a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/pf/ftp-proxy/ftp-proxy.c
View File

@ -103,7 +103,7 @@ void client_read(struct bufferevent *, void *);
int drop_privs(void);
void end_session(struct session *);
void exit_daemon(void);
int getline(char *, size_t *);
int get_line(char *, size_t *);
void handle_connection(const int, short, void *);
void handle_signal(int, short, void *);
struct session * init_session(void);
@ -249,7 +249,7 @@ client_read(struct bufferevent *bufev, void *arg)
buf_avail);
s->cbuf_valid += clientread;
while ((n = getline(s->cbuf, &s->cbuf_valid)) > 0) {
while ((n = get_line(s->cbuf, &s->cbuf_valid)) > 0) {
logmsg(LOG_DEBUG, "#%d client: %s", s->id, linebuf);
if (!client_parse(s)) {
end_session(s);
@ -343,7 +343,7 @@ exit_daemon(void)
}
int
getline(char *buf, size_t *valid)
get_line(char *buf, size_t *valid)
{
size_t i;
@ -1087,7 +1087,7 @@ server_read(struct bufferevent *bufev, void *arg)
buf_avail);
s->sbuf_valid += srvread;
while ((n = getline(s->sbuf, &s->sbuf_valid)) > 0) {
while ((n = get_line(s->sbuf, &s->sbuf_valid)) > 0) {
logmsg(LOG_DEBUG, "#%d server: %s", s->id, linebuf);
if (!server_parse(s)) {
end_session(s);