*: introduce and use bb_unsetenv_and_free
function old new delta bb_unsetenv_and_free - 17 +17 tcpudpsvd_main 1819 1810 -9 safe_setenv 58 47 -11 udhcp_run_script 630 616 -14 make_device 1683 1663 -20 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 0/4 up/down: 17/-54) Total: -37 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
@@ -85,8 +85,7 @@ static void undo_xsetenv(void)
|
||||
char **pp = env_cur = &env_var[0];
|
||||
while (*pp) {
|
||||
char *var = *pp;
|
||||
bb_unsetenv(var);
|
||||
free(var);
|
||||
bb_unsetenv_and_free(var);
|
||||
*pp++ = NULL;
|
||||
}
|
||||
}
|
||||
|
@@ -327,8 +327,7 @@ static void udhcp_run_script(struct dhcp_packet *packet, const char *name)
|
||||
|
||||
for (curr = envp; *curr; curr++) {
|
||||
log2(" %s", *curr);
|
||||
bb_unsetenv(*curr);
|
||||
free(*curr);
|
||||
bb_unsetenv_and_free(*curr);
|
||||
}
|
||||
free(envp);
|
||||
}
|
||||
|
Reference in New Issue
Block a user