matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Gerrit Renker 2010-12-21 12:54:09 +01:00 committed by Stephen Hemminger
parent 0c7a594541
commit 94089ef772
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/utils.h
View File

@ -79,7 +79,7 @@ extern int mask2bits(__u32 netmask);
extern int get_integer(int *val, const char *arg, int base); 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_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_byte get_u8
#define get_ushort get_u16 #define get_ushort get_u16
#define get_short get_s16 #define get_short get_s16

6
ip/iproute.c
View File

@ -840,7 +840,7 @@ int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
mxlock |= (1<<RTAX_RTT); mxlock |= (1<<RTAX_RTT);
NEXT_ARG(); NEXT_ARG();
} }
if (get_jiffies(&rtt, *argv, 0, &raw)) if (get_jiffies(&rtt, *argv, &raw))
invarg("\"rtt\" value is invalid\n", *argv); invarg("\"rtt\" value is invalid\n", *argv);
rta_addattr32(mxrta, sizeof(mxbuf), RTAX_RTT, rta_addattr32(mxrta, sizeof(mxbuf), RTAX_RTT,
(raw) ? rtt : rtt * 8); (raw) ? rtt : rtt * 8);
@ -848,7 +848,7 @@ int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
unsigned rto_min; unsigned rto_min;
NEXT_ARG(); NEXT_ARG();
mxlock |= (1<<RTAX_RTO_MIN); 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", invarg("\"rto_min\" value is invalid\n",
*argv); *argv);
rta_addattr32(mxrta, sizeof(mxbuf), RTAX_RTO_MIN, 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); mxlock |= (1<<RTAX_RTTVAR);
NEXT_ARG(); NEXT_ARG();
} }
if (get_jiffies(&win, *argv, 0, &raw)) if (get_jiffies(&win, *argv, &raw))
invarg("\"rttvar\" value is invalid\n", *argv); invarg("\"rttvar\" value is invalid\n", *argv);
rta_addattr32(mxrta, sizeof(mxbuf), RTAX_RTTVAR, rta_addattr32(mxrta, sizeof(mxbuf), RTAX_RTTVAR,
(raw) ? win : win * 4); (raw) ? win : win * 4);

4
lib/utils.c
View File

@ -100,7 +100,7 @@ int get_unsigned(unsigned *val, const char *arg, int base)
* a "raw" number. * 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; double t;
unsigned long res; unsigned long res;
@ -112,7 +112,7 @@ int get_jiffies(unsigned *jiffies, const char *arg, int base, int *raw)
return -1; return -1;
} }
else { else {
res = strtoul(arg,&p,base); res = strtoul(arg, &p, 0);
if (res > UINT_MAX) if (res > UINT_MAX)
return -1; return -1;
t = (double)res; t = (double)res;