From dd8adde3866ac22bd510348b733bb29e1662ac6d Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 24 Jun 2010 05:00:50 +0200 Subject: *: 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 --- networking/tcpudp.c | 3 +-- networking/udhcp/dhcpc.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'networking') diff --git a/networking/tcpudp.c b/networking/tcpudp.c index 42845df0e..b32fad624 100644 --- a/networking/tcpudp.c +++ b/networking/tcpudp.c @@ -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; } } diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c index c2b21c695..de1b79844 100644 --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c @@ -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); } -- cgit v1.2.3