avoid using strok - eliminates use of hidden global variable
function old new delta udhcp_str2optset 616 650 +34 setpriv_main 950 975 +25 switch_root_main 688 706 +18 parse 958 970 +12 getopt_main 622 628 +6 parse_resolvconf 302 306 +4 mpstat_main 1139 1142 +3 static.p 4 - -4 cdcmd 717 702 -15 strtok 148 - -148 ------------------------------------------------------------------------------ (add/remove: 0/3 grow/shrink: 7/1 up/down: 102/-167) Total: -65 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
@ -19,15 +19,17 @@ int FAST_FUNC get_linux_version_code(void)
|
||||
{
|
||||
struct utsname name;
|
||||
char *t;
|
||||
int i, r;
|
||||
int r;
|
||||
|
||||
uname(&name); /* never fails */
|
||||
t = name.release;
|
||||
r = 0;
|
||||
for (i = 0; i < 3; i++) {
|
||||
t = strtok(t, ".");
|
||||
r = r * 256 + (t ? atoi(t) : 0);
|
||||
t = NULL;
|
||||
}
|
||||
return r;
|
||||
t = name.release - 1;
|
||||
r = 1;
|
||||
do {
|
||||
r <<= 8;
|
||||
if (t) {
|
||||
r += atoi(++t);
|
||||
t = strchr(t, '.');
|
||||
}
|
||||
} while (r < 0x1000000);
|
||||
return r - 0x1000000;
|
||||
}
|
||||
|
Reference in New Issue
Block a user