d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ipfw] quieten maybe-uninitialized errors in ipfw when compiled under mips-gcc-6.3.0.

Browse Source 
This is mostly an exercise to set variables to NULL/0 when declared, but
one was ensuring a string variable was set before printing it.
We should never see "<unknown>" in a printed rule; if we do then this code
definitely has some bugs that need addressing.
This commit is contained in:
Adrian Chadd 2020-07-14 05:07:16 +00:00
parent 14679cb2f3
commit 268a20a0e7
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbin/ipfw/dummynet.c
View File

@ -1279,8 +1279,8 @@ ipfw_config_pipe(int ac, char **av)
struct dn_profile *pf = NULL; struct dn_profile *pf = NULL;
struct ipfw_flow_id *mask = NULL; struct ipfw_flow_id *mask = NULL;
#ifdef NEW_AQM #ifdef NEW_AQM
struct dn_extra_parms *aqm_extra; struct dn_extra_parms *aqm_extra = NULL;
struct dn_extra_parms *sch_extra; struct dn_extra_parms *sch_extra = NULL;
int lmax_extra; int lmax_extra;
#endif #endif

12
sbin/ipfw/ipfw2.c
View File

@ -1618,6 +1618,9 @@ print_instruction(struct buf_pr *bp, const struct format_opts *fo,
case O_TCPWIN: case O_TCPWIN:
s = "tcpwin"; s = "tcpwin";
break; break;
default:
s = "<unknown>";
break;
} }
bprintf(bp, " %s %u", s, cmd->arg1); bprintf(bp, " %s %u", s, cmd->arg1);
} else } else
@ -4003,7 +4006,7 @@ compile_rule(char *av[], uint32_t *rbuf, int *rbufsize, struct tidx *tstate)
struct addrinfo *res; struct addrinfo *res;
char *s, *end; char *s, *end;
int family; int family;
u_short port_number; u_short port_number = 0;
NEED1("missing forward address[:port]"); NEED1("missing forward address[:port]");
@ -5600,7 +5603,7 @@ ifinfo_cmp(const void *a, const void *b)
static void static void
ipfw_list_tifaces(void) ipfw_list_tifaces(void)
{ {
ipfw_obj_lheader *olh; ipfw_obj_lheader *olh = NULL;
ipfw_iface_info *info; ipfw_iface_info *info;
uint32_t i; uint32_t i;
int error; int error;
@ -5608,7 +5611,6 @@ ipfw_list_tifaces(void)
if ((error = ipfw_get_tracked_ifaces(&olh)) != 0) if ((error = ipfw_get_tracked_ifaces(&olh)) != 0)
err(EX_OSERR, "Unable to request ipfw tracked interface list"); err(EX_OSERR, "Unable to request ipfw tracked interface list");
qsort(olh + 1, olh->count, olh->objsize, ifinfo_cmp); qsort(olh + 1, olh->count, olh->objsize, ifinfo_cmp);
info = (ipfw_iface_info *)(olh + 1); info = (ipfw_iface_info *)(olh + 1);
@ -5625,7 +5627,3 @@ ipfw_list_tifaces(void)
free(olh); free(olh);
} }

1
sbin/ipfw/nat64lsn.c
View File

@ -99,6 +99,7 @@ nat64lsn_print_states(void *buf)
stg = (ipfw_nat64lsn_stg_v1 *)(od + 1); stg = (ipfw_nat64lsn_stg_v1 *)(od + 1);
sz = od->head.length - sizeof(*od); sz = od->head.length - sizeof(*od);
next_idx = 0; next_idx = 0;
proto = NULL;
while (sz > 0 && next_idx != 0xFF) { while (sz > 0 && next_idx != 0xFF) {
next_idx = stg->next.index; next_idx = stg->next.index;
sz -= sizeof(*stg); sz -= sizeof(*stg);

4
sbin/ipfw/tables.c
View File

@ -847,7 +847,7 @@ table_show_info(ipfw_xtable_info *i, void *arg)
static int static int
table_show_one(ipfw_xtable_info *i, void *arg) table_show_one(ipfw_xtable_info *i, void *arg)
{ {
ipfw_obj_header *oh; ipfw_obj_header *oh = NULL;
int error; int error;
int is_all; int is_all;
@ -1179,7 +1179,7 @@ tentry_fill_key_type(char *arg, ipfw_obj_tentry *tentry, uint8_t type,
struct servent *sent; struct servent *sent;
int masklen; int masklen;
masklen = 0; mask = masklen = 0;
af = 0; af = 0;
paddr = (struct in6_addr *)&tentry->k; paddr = (struct in6_addr *)&tentry->k;