diff options
| author |   fgsch <fgsch@openbsd.org> | 2012-03-04 04:05:15 +0000 |
|---|---|---|
| committer | fgsch <fgsch@openbsd.org> | 2012-03-04 04:05:15 +0000 |
| commit | f9bbbf4534171e957bb7652e706dd78782fbffa2 (patch) | |
| tree | 3828b3cf6a92fdae28d55bf6c8000c490e4996d0 /usr.sbin/ftp-proxy | |
| parent | Document sem_timedwait() (diff) | |
| download | wireguard-openbsd-f9bbbf4534171e957bb7652e706dd78782fbffa2.tar.xz wireguard-openbsd-f9bbbf4534171e957bb7652e706dd78782fbffa2.zip | |
In preparation for getline and getdelim additions to libc, rename getline()
occurrences to get_line().
Based on a diff from Jan Klemkow <j-dot-klemkow-at-wemelug-dot-de> to tech.
Diffstat (limited to 'usr.sbin/ftp-proxy')
| -rw-r--r-- | usr.sbin/ftp-proxy/ftp-proxy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/ftp-proxy/ftp-proxy.c b/usr.sbin/ftp-proxy/ftp-proxy.c index c077f8e61f9..5a0dbb9f5af 100644 --- a/usr.sbin/ftp-proxy/ftp-proxy.c +++ b/usr.sbin/ftp-proxy/ftp-proxy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftp-proxy.c,v 1.23 2011/06/21 17:31:07 mikeb Exp $ */ +/* $OpenBSD: ftp-proxy.c,v 1.24 2012/03/04 04:05:15 fgsch Exp $ */ /* * Copyright (c) 2004, 2005 Camiel Dobbelaar, <cd@sentia.nl> @@ -93,7 +93,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); @@ -239,7 +239,7 @@ client_read(struct bufferevent *bufev, void *arg) buf_avail); s->cbuf_valid += read; - 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); @@ -333,7 +333,7 @@ exit_daemon(void) } int -getline(char *buf, size_t *valid) +get_line(char *buf, size_t *valid) { size_t i; @@ -1055,7 +1055,7 @@ server_read(struct bufferevent *bufev, void *arg) buf_avail); s->sbuf_valid += read; - 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); |