From: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Date: Tue, 21 Dec 2010 11:54:09 +0000 (+0100)
Subject: utils: get_jiffies always uses base=0
X-Git-Tag: v2.6.39~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=897fb84fd9b872a544076f88430bc35fc12b7cc8;p=thirdparty%2Fiproute2.git

utils: get_jiffies always uses base=0

get_jiffies() is in all places called in the same manner, with base=0;
simplify argument list by putting the constant value into the function.
---

diff --git a/include/utils.h b/include/utils.h
index 3da699858..6cb3e42e8 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -79,7 +79,7 @@ extern int mask2bits(__u32 netmask);
 
 extern int get_integer(int *val, const char *arg, int base);
 extern int get_unsigned(unsigned *val, const char *arg, int base);
-extern int get_jiffies(unsigned *val, const char *arg, int base, int *raw);
+extern int get_jiffies(unsigned *val, const char *arg, int *raw);
 #define get_byte get_u8
 #define get_ushort get_u16
 #define get_short get_s16
diff --git a/ip/iproute.c b/ip/iproute.c
index 0d69290b1..f3e7eb425 100644
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@ -840,7 +840,7 @@ int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
 				mxlock |= (1<<RTAX_RTT);
 				NEXT_ARG();
 			}
-			if (get_jiffies(&rtt, *argv, 0, &raw))
+			if (get_jiffies(&rtt, *argv, &raw))
 				invarg("\"rtt\" value is invalid\n", *argv);
 			rta_addattr32(mxrta, sizeof(mxbuf), RTAX_RTT, 
 				(raw) ? rtt : rtt * 8);
@@ -848,7 +848,7 @@ int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
 			unsigned rto_min;
 			NEXT_ARG();
 			mxlock |= (1<<RTAX_RTO_MIN);
-			if (get_jiffies(&rto_min, *argv, 0, &raw))
+			if (get_jiffies(&rto_min, *argv, &raw))
 				invarg("\"rto_min\" value is invalid\n",
 				       *argv);
 			rta_addattr32(mxrta, sizeof(mxbuf), RTAX_RTO_MIN,
@@ -900,7 +900,7 @@ int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
 				mxlock |= (1<<RTAX_RTTVAR);
 				NEXT_ARG();
 			}
-			if (get_jiffies(&win, *argv, 0, &raw))
+			if (get_jiffies(&win, *argv, &raw))
 				invarg("\"rttvar\" value is invalid\n", *argv);
 			rta_addattr32(mxrta, sizeof(mxbuf), RTAX_RTTVAR,
 				(raw) ? win : win * 4);
diff --git a/lib/utils.c b/lib/utils.c
index a60d884e5..52f2b1f44 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -100,7 +100,7 @@ int get_unsigned(unsigned *val, const char *arg, int base)
  * a "raw" number.
  */
 
-int get_jiffies(unsigned *jiffies, const char *arg, int base, int *raw)
+int get_jiffies(unsigned *jiffies, const char *arg, int *raw)
 {
 	double t;
 	unsigned long res;
@@ -112,7 +112,7 @@ int get_jiffies(unsigned *jiffies, const char *arg, int base, int *raw)
 			return -1;
 	}
 	else {
-		res = strtoul(arg,&p,base);
+		res = strtoul(arg, &p, 0);
 		if (res > UINT_MAX)
 			return -1;
 		t = (double)res;