diff options
| author | melifaro <melifaro@FreeBSD.org> | 2014-10-04 17:21:30 +0000 |
|---|---|---|
| committer | melifaro <melifaro@FreeBSD.org> | 2014-10-04 17:21:30 +0000 |
| commit | 94289f5d3934e2c58e0829ac8c967da579783e2b (patch) | |
| tree | b81193fa894daca50c91c5811f29d892dc709c1d /sbin/ipfw | |
| parent | 1e90e104a024e339c46de677d3823af61a5a59b2 (diff) | |
| download | FreeBSD-src-94289f5d3934e2c58e0829ac8c967da579783e2b.zip FreeBSD-src-94289f5d3934e2c58e0829ac8c967da579783e2b.tar.gz | |
Fix GCC wardnings.
Diffstat (limited to 'sbin/ipfw')
| -rw-r--r-- | sbin/ipfw/ipfw2.c | 2 | ||||
| -rw-r--r-- | sbin/ipfw/tables.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c index 6045776..ad2ae8b 100644 --- a/sbin/ipfw/ipfw2.c +++ b/sbin/ipfw/ipfw2.c @@ -3599,7 +3599,7 @@ chkarg: errx(EX_USAGE, "missing argument for %s", *(av - 1)); if (isdigit(**av)) { action->arg1 = strtoul(*av, NULL, 10); - if (action->arg1 <= 0 || action->arg1 >= IP_FW_TARG) + if (action->arg1 <= 0 || action->arg1 >= IP_FW_TABLEARG) errx(EX_DATAERR, "illegal argument for %s", *(av - 1)); } else if (_substrcmp(*av, "tablearg") == 0) { diff --git a/sbin/ipfw/tables.c b/sbin/ipfw/tables.c index 3d5e160..9e6d49a 100644 --- a/sbin/ipfw/tables.c +++ b/sbin/ipfw/tables.c @@ -38,7 +38,6 @@ #include "ipfw2.h" -static void table_list(ipfw_xtable_info *i, int need_header); static void table_modify_record(ipfw_obj_header *oh, int ac, char *av[], int add, int quiet, int update, int atomic); static int table_flush(ipfw_obj_header *oh); @@ -1386,6 +1385,7 @@ tentry_fill_value(ipfw_obj_header *oh, ipfw_obj_tentry *tent, char *arg, uint32_t a4, flag, val, vm; ipfw_table_value *v; uint32_t i; + int dval; char *comma, *e, *etype, *n, *p; v = &tent->v.value; @@ -1480,9 +1480,10 @@ tentry_fill_value(ipfw_obj_header *oh, ipfw_obj_tentry *tent, char *arg, break; case IPFW_VTYPE_DSCP: if (isalpha(*n)) { - if ((v->dscp = match_token(f_ipdscp, n)) != -1) + if ((dval = match_token(f_ipdscp, n)) != -1) { + v->dscp = dval; break; - else + } else etype = "DSCP code"; } else { v->dscp = strtol(n, &e, 10); |
