From 9fdec30e232e74e103d80049e0772f2d619574cb Mon Sep 17 00:00:00 2001 From: Eric Leblond Date: Tue, 29 Jul 2008 12:24:18 +0200 Subject: cleanup: fix gcc warnings This patch fixes some gcc warnings: * Unused variables * Functions with wrong return (or without return) Signed-off-by: Eric Leblond Signed-off-by: Pablo Neira Ayuso --- filter/raw2packet/ulogd_raw2packet_BASE.c | 3 --- filter/ulogd_filter_IFINDEX.c | 2 +- filter/ulogd_filter_IP2BIN.c | 4 ++-- filter/ulogd_filter_PWSNIFF.c | 1 - 4 files changed, 3 insertions(+), 7 deletions(-) (limited to 'filter') diff --git a/filter/raw2packet/ulogd_raw2packet_BASE.c b/filter/raw2packet/ulogd_raw2packet_BASE.c index dde1cf3..7c6fd26 100644 --- a/filter/raw2packet/ulogd_raw2packet_BASE.c +++ b/filter/raw2packet/ulogd_raw2packet_BASE.c @@ -920,9 +920,6 @@ static int _interp_arp(struct ulogd_pluginstance *pi, u_int32_t len) static int _interp_bridge(struct ulogd_pluginstance *pi, u_int32_t len) { - struct ulogd_key *ret = pi->output.keys; - const struct sk_buff *skb = - GET_VALUE(pi->input.keys, INKEY_RAW_PCKT).ptr; const u_int16_t proto = GET_VALUE(pi->input.keys, INKEY_OOB_PROTOCOL).ui16; diff --git a/filter/ulogd_filter_IFINDEX.c b/filter/ulogd_filter_IFINDEX.c index 6491127..f7571bd 100644 --- a/filter/ulogd_filter_IFINDEX.c +++ b/filter/ulogd_filter_IFINDEX.c @@ -84,7 +84,7 @@ static int nlif_read_cb(int fd, unsigned int what, void *param) if (!(what & ULOGD_FD_READ)) return 0; - nlif_catch(nlif_inst); + return nlif_catch(nlif_inst); } static int ifindex_start(struct ulogd_pluginstance *upi) diff --git a/filter/ulogd_filter_IP2BIN.c b/filter/ulogd_filter_IP2BIN.c index c4b44fa..2d9fc16 100644 --- a/filter/ulogd_filter_IP2BIN.c +++ b/filter/ulogd_filter_IP2BIN.c @@ -147,7 +147,7 @@ static char *ip2bin(struct ulogd_key* inp, int index, char family) default: /* TODO handle error */ ulogd_log(ULOGD_NOTICE, "Unknown protocol family\n"); - return; + return NULL; } buffer = tmp; @@ -161,7 +161,7 @@ static char *ip2bin(struct ulogd_key* inp, int index, char family) addr8[0], addr8[1], addr8[2], addr8[3]); if (written != 2 * 4) { buffer[0] = 0; - return; + return NULL; } buffer += written; addr8 += 4; diff --git a/filter/ulogd_filter_PWSNIFF.c b/filter/ulogd_filter_PWSNIFF.c index 95d92b5..290e4cb 100644 --- a/filter/ulogd_filter_PWSNIFF.c +++ b/filter/ulogd_filter_PWSNIFF.c @@ -60,7 +60,6 @@ static unsigned char *_get_next_blank(unsigned char* begp, unsigned char *endp) static int interp_pwsniff(struct ulogd_pluginstance *pi) { - struct ulogd_key *inp = pi->input.keys; struct ulogd_key *ret = pi->output.keys; struct iphdr *iph; void *protoh; -- cgit v1.2.3