diff options
| author | Eric Leblond <eric@inl.fr> | 2008-07-31 10:40:55 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2008-07-31 10:40:55 +0200 |
| commit | a52690d2dbb0e14d705ba990cda9b7869a747c0b (patch) | |
| tree | 6d2a060110e09216e5ed85c101531aef85e4db44 | |
| parent | 507184089236463df25119a4274f4c7dafa60292 (diff) | |
cleanup: remove unused timeout parameter in function
The function ipulog_read had a timeout parameter which was not
used in the code.
Signed-off-by: Eric Leblond <eric@inl.fr>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | include/libipulog/libipulog.h | 2 | ||||
| -rw-r--r-- | input/packet/ulogd_inppkt_ULOG.c | 2 | ||||
| -rw-r--r-- | libipulog/libipulog.c | 2 | ||||
| -rw-r--r-- | libipulog/ulog_test.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/libipulog/libipulog.h b/include/libipulog/libipulog.h index a049d27..1f6aee9 100644 --- a/include/libipulog/libipulog.h +++ b/include/libipulog/libipulog.h @@ -29,7 +29,7 @@ struct ipulog_handle *ipulog_create_handle(u_int32_t gmask, u_int32_t rmem); void ipulog_destroy_handle(struct ipulog_handle *h); ssize_t ipulog_read(struct ipulog_handle *h, - unsigned char *buf, size_t len, int timeout); + unsigned char *buf, size_t len); ulog_packet_msg_t *ipulog_get_packet(struct ipulog_handle *h, const unsigned char *buf, diff --git a/input/packet/ulogd_inppkt_ULOG.c b/input/packet/ulogd_inppkt_ULOG.c index c00d9bf..3fdb42e 100644 --- a/input/packet/ulogd_inppkt_ULOG.c +++ b/input/packet/ulogd_inppkt_ULOG.c @@ -255,7 +255,7 @@ static int ulog_read_cb(int fd, unsigned int what, void *param) return 0; while ((len = ipulog_read(u->libulog_h, u->libulog_buf, - upi->config_kset->ces[0].u.value, 1))) { + upi->config_kset->ces[0].u.value))) { if (len <= 0) { if (errno == EAGAIN) break; diff --git a/libipulog/libipulog.c b/libipulog/libipulog.c index 8917bcc..6b7ea35 100644 --- a/libipulog/libipulog.c +++ b/libipulog/libipulog.c @@ -190,7 +190,7 @@ int ipulog_set_mode() /* do a BLOCKING read on an ipulog handle */ ssize_t ipulog_read(struct ipulog_handle *h, unsigned char *buf, - size_t len, int timeout) + size_t len) { return ipulog_netlink_recvfrom(h, buf, len); } diff --git a/libipulog/ulog_test.c b/libipulog/ulog_test.c index c891764..fd9c925 100644 --- a/libipulog/ulog_test.c +++ b/libipulog/ulog_test.c @@ -67,7 +67,7 @@ int main(int argc, char *argv[]) /* loop receiving packets and handling them over to handle_packet */ for (i = 0; i < atoi(argv[1]); i++) { - len = ipulog_read(h, buf, MYBUFSIZ, 1); + len = ipulog_read(h, buf, MYBUFSIZ); if (len <= 0) { ipulog_perror("ulog_test: short read"); exit(1); |