diff options
author | /C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org> | 2008-01-17 17:37:27 +0000 |
---|---|---|
committer | /C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org> | 2008-01-17 17:37:27 +0000 |
commit | 1f2483506ca384e87158d44fa2d9db53daeb11c9 (patch) | |
tree | b49c68fa4363141bdc195d8474b197461d12e2d2 /src | |
parent | 001805d9998229534264758432c06295614f8e2a (diff) | |
download | conntrack-tools-1f2483506ca384e87158d44fa2d9db53daeb11c9.tar.gz conntrack-tools-1f2483506ca384e87158d44fa2d9db53daeb11c9.zip |
Max Kellermann <max@duempel.org>:
remove superfluous initialization
Diffstat (limited to 'src')
-rw-r--r-- | src/conntrack.c | 2 | ||||
-rw-r--r-- | src/mcast.c | 3 | ||||
-rw-r--r-- | src/sync-mode.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/conntrack.c b/src/conntrack.c index 5f0cb1a..f170bed 100644 --- a/src/conntrack.c +++ b/src/conntrack.c @@ -156,7 +156,7 @@ void register_proto(struct ctproto_handler *h) static struct ctproto_handler *findproto(char *name) { - struct ctproto_handler *cur = NULL, *handler = NULL; + struct ctproto_handler *cur, *handler = NULL; if (!name) return handler; diff --git a/src/mcast.c b/src/mcast.c index 77aa35c..414f031 100644 --- a/src/mcast.c +++ b/src/mcast.c @@ -191,7 +191,7 @@ __mcast_client_create_ipv6(struct mcast_sock *m, struct mcast_conf *conf) struct mcast_sock *mcast_client_create(struct mcast_conf *conf) { - int ret = 0; + int ret; struct mcast_sock *m; m = (struct mcast_sock *) malloc(sizeof(struct mcast_sock)); @@ -221,6 +221,7 @@ struct mcast_sock *mcast_client_create(struct mcast_conf *conf) ret = __mcast_client_create_ipv6(m, conf); break; default: + ret = 0; break; } diff --git a/src/sync-mode.c b/src/sync-mode.c index 0a0fcc2..dc8e782 100644 --- a/src/sync-mode.c +++ b/src/sync-mode.c @@ -39,7 +39,7 @@ static void do_mcast_handler_step(struct nethdr *net) struct netpld *pld = NETHDR_DATA(net); char __ct[nfct_maxsize()]; struct nf_conntrack *ct = (struct nf_conntrack *)(void*) __ct; - struct us_conntrack *u = NULL; + struct us_conntrack *u; if (STATE_SYNC(sync)->recv(net)) return; |