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>

diff --git a/include/libipulog/libipulog.h b/include/libipulog/libipulog.h
index a049d27f5cb25b2a1efcbae33ed86bc9fe5571ec..1f6aee9bf27bf8fcfb96b61752c490d80bc21e1c 100644 (file)
--- 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 c00d9bf8a965be7f961738892e19191efcf8f691..3fdb42e6c654dde32e683da4023a915485b430d3 100644 (file)
--- 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 8917bcc5d5c9ff05a2bdf7b1c82e118d47bd36d8..6b7ea355885b1da04b696c41f0f9b1a622cbc17b 100644 (file)
--- 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 c891764cda4f5fa508a3deb744ca015ba9aa1bb5..fd9c9250ea6789527ae4e3a209c9b25a7962bdbb 100644 (file)
--- 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);