svn commit: r272530 - projects/ipfw/sbin/ipfw

[Alexander V. Chernikov]

Author: melifaro
Date: Sat Oct  4 17:21:30 2014
New Revision: 272530
URL: https://svnweb.freebsd.org/changeset/base/272530

Log:
  Fix GCC wardnings.

Modified:
  projects/ipfw/sbin/ipfw/ipfw2.c
  projects/ipfw/sbin/ipfw/tables.c

Modified: projects/ipfw/sbin/ipfw/ipfw2.c
==============================================================================
--- projects/ipfw/sbin/ipfw/ipfw2.c	Sat Oct  4 16:00:34 2014	(r272529)
+++ projects/ipfw/sbin/ipfw/ipfw2.c	Sat Oct  4 17:21:30 2014	(r272530)
@@ -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) {

Modified: projects/ipfw/sbin/ipfw/tables.c
==============================================================================
--- projects/ipfw/sbin/ipfw/tables.c	Sat Oct  4 16:00:34 2014	(r272529)
+++ projects/ipfw/sbin/ipfw/tables.c	Sat Oct  4 17:21:30 2014	(r272530)
@@ -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, i
 	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, i
 			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);