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-15 13:01:46 +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-15 13:01:46 +0000 |
| commit | ba364998484de5a3ed37b843a8e34eacb2a21953 (patch) | |
| tree | 30b97d5c20633b4cd5cdb9addebd36a481066fe6 /src/network.c | |
| parent | 4ddee9e2555817bd94521677e808caed665c3393 (diff) | |
| download | conntrack-tools-ba364998484de5a3ed37b843a8e34eacb2a21953.tar.gz conntrack-tools-ba364998484de5a3ed37b843a8e34eacb2a21953.zip | |
Max Kellermann <max@duempel.org>:
fix shadow warnings by renaming variables or making them local
Diffstat (limited to 'src/network.c')
| -rw-r--r-- | src/network.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/network.c b/src/network.c index a20c1e0..8f1dc94 100644 --- a/src/network.c +++ b/src/network.c @@ -96,12 +96,12 @@ static char *tx_buf; #define HEADERSIZ 28 /* IP header (20 bytes) + UDP header 8 (bytes) */ -int mcast_buffered_init(struct mcast_conf *conf) +int mcast_buffered_init(struct mcast_conf *mconf) { - int mtu = conf->mtu - HEADERSIZ; + int mtu = mconf->mtu - HEADERSIZ; /* default to Ethernet MTU 1500 bytes */ - if (conf->mtu == 0) + if (mconf->mtu == 0) mtu = 1500 - HEADERSIZ; tx_buf = malloc(mtu); @@ -199,12 +199,12 @@ int handle_netmsg(struct nethdr *net) int mcast_track_seq(u_int32_t seq, u_int32_t *exp_seq) { - static int seq_set = 0; + static int local_seq_set = 0; int ret = 1; /* netlink sequence tracking initialization */ - if (!seq_set) { - seq_set = 1; + if (!local_seq_set) { + local_seq_set = 1; goto out; } |