Page MenuHomeFreeBSD

D40654.id123529.diff
No OneTemporary

D40654.id123529.diff

diff --git a/sbin/ipfw/nat.c b/sbin/ipfw/nat.c
--- a/sbin/ipfw/nat.c
+++ b/sbin/ipfw/nat.c
@@ -1074,7 +1074,6 @@
struct nat44_cfg_nat *cfg;
size_t sz;
uint32_t i;
- int error;
/* Start with reasonable default */
sz = sizeof(*olh) + 16 * sizeof(struct nat44_cfg_nat);
@@ -1097,7 +1096,7 @@
cfg = (struct nat44_cfg_nat*)(olh + 1);
for (i = 0; i < olh->count; i++) {
- error = f(cfg, arg); /* Ignore errors for now */
+ (void)f(cfg, arg); /* Ignore errors for now */
cfg = (struct nat44_cfg_nat *)((caddr_t)cfg +
olh->objsize);
}
diff --git a/sbin/ipfw/nat64clat.c b/sbin/ipfw/nat64clat.c
--- a/sbin/ipfw/nat64clat.c
+++ b/sbin/ipfw/nat64clat.c
@@ -505,7 +505,6 @@
ipfw_nat64clat_cfg *cfg;
size_t sz;
uint32_t i;
- int error;
/* Start with reasonable default */
sz = sizeof(*olh) + 16 * sizeof(*cfg);
@@ -528,7 +527,7 @@
cfg = (ipfw_nat64clat_cfg *)(olh + 1);
for (i = 0; i < olh->count; i++) {
- error = f(cfg, name, set); /* Ignore errors for now */
+ (void)f(cfg, name, set); /* Ignore errors for now */
cfg = (ipfw_nat64clat_cfg *)((caddr_t)cfg +
olh->objsize);
}
diff --git a/sbin/ipfw/nat64lsn.c b/sbin/ipfw/nat64lsn.c
--- a/sbin/ipfw/nat64lsn.c
+++ b/sbin/ipfw/nat64lsn.c
@@ -853,7 +853,6 @@
ipfw_nat64lsn_cfg *cfg;
size_t sz;
uint32_t i;
- int error;
/* Start with reasonable default */
sz = sizeof(*olh) + 16 * sizeof(ipfw_nat64lsn_cfg);
@@ -877,7 +876,7 @@
cfg = (ipfw_nat64lsn_cfg *)(olh + 1);
for (i = 0; i < olh->count; i++) {
- error = f(cfg, name, set); /* Ignore errors for now */
+ (void)f(cfg, name, set); /* Ignore errors for now */
cfg = (ipfw_nat64lsn_cfg *)((caddr_t)cfg +
olh->objsize);
}
diff --git a/sbin/ipfw/nat64stl.c b/sbin/ipfw/nat64stl.c
--- a/sbin/ipfw/nat64stl.c
+++ b/sbin/ipfw/nat64stl.c
@@ -521,7 +521,6 @@
ipfw_nat64stl_cfg *cfg;
size_t sz;
uint32_t i;
- int error;
/* Start with reasonable default */
sz = sizeof(*olh) + 16 * sizeof(*cfg);
@@ -544,7 +543,7 @@
cfg = (ipfw_nat64stl_cfg *)(olh + 1);
for (i = 0; i < olh->count; i++) {
- error = f(cfg, name, set); /* Ignore errors for now */
+ (void)f(cfg, name, set); /* Ignore errors for now */
cfg = (ipfw_nat64stl_cfg *)((caddr_t)cfg +
olh->objsize);
}
diff --git a/sbin/ipfw/nptv6.c b/sbin/ipfw/nptv6.c
--- a/sbin/ipfw/nptv6.c
+++ b/sbin/ipfw/nptv6.c
@@ -420,7 +420,6 @@
ipfw_nptv6_cfg *cfg;
size_t sz;
uint32_t i;
- int error;
/* Start with reasonable default */
sz = sizeof(*olh) + 16 * sizeof(*cfg);
@@ -442,7 +441,7 @@
cfg = (ipfw_nptv6_cfg *)(olh + 1);
for (i = 0; i < olh->count; i++) {
- error = f(cfg, name, set);
+ (void)f(cfg, name, set);
cfg = (ipfw_nptv6_cfg *)((caddr_t)cfg + olh->objsize);
}
free(olh);
diff --git a/sbin/ipfw/tables.c b/sbin/ipfw/tables.c
--- a/sbin/ipfw/tables.c
+++ b/sbin/ipfw/tables.c
@@ -1408,7 +1408,6 @@
{
char *p;
struct in6_addr addr;
- uint32_t kv;
if (ishexnumber(*key) != 0 || *key == ':') {
/* Remove / if exists */
@@ -1424,7 +1423,7 @@
} else {
/* Port or any other key */
/* Skip non-base 10 entries like 'fa1' */
- kv = strtol(key, &p, 10);
+ (void)strtol(key, &p, 10);
if (*p == '\0') {
*ptype = IPFW_TABLE_NUMBER;
return (0);
@@ -1712,7 +1711,6 @@
ipfw_xtable_info *info;
size_t sz;
uint32_t i;
- int error;
/* Start with reasonable default */
sz = sizeof(*olh) + 16 * sizeof(ipfw_xtable_info);
@@ -1737,7 +1735,7 @@
info = (ipfw_xtable_info *)(olh + 1);
for (i = 0; i < olh->count; i++) {
if (g_co.use_set == 0 || info->set == g_co.use_set - 1)
- error = f(info, arg);
+ (void)f(info, arg);
info = (ipfw_xtable_info *)((caddr_t)info +
olh->objsize);
}

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 15, 12:24 PM (53 m, 4 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27648651
Default Alt Text
D40654.id123529.diff (3 KB)

Event Timeline