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:
@@ -703,12 +703,13 @@ static void parse_resolvconf(void)
|
||||
|
||||
while (fgets(line, sizeof(line), resolv)) {
|
||||
char *p, *arg;
|
||||
char *tokstate;
|
||||
|
||||
p = strtok(line, " \t\n");
|
||||
p = strtok_r(line, " \t\n", &tokstate);
|
||||
if (!p)
|
||||
continue;
|
||||
dbg("resolv_key:'%s'\n", p);
|
||||
arg = strtok(NULL, "\n");
|
||||
arg = strtok_r(NULL, "\n", &tokstate);
|
||||
dbg("resolv_arg:'%s'\n", arg);
|
||||
if (!arg)
|
||||
continue;
|
||||
|
Reference in New Issue
Block a user