diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2023-06-15 12:55:56 +0300 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2023-06-15 12:55:56 +0300 |
| commit | 648f506949ded749e28186d0092b6e42085c897b (patch) | |
| tree | 049c72bc8149f41fc617d00f7d32f1d6384f8e2f /networking | |
| parent | 61a4959251667751e424e600c6cb75de39d6b1c3 (diff) | |
libbb: code shrink: introduce and use [_]exit_FAILURE()
function old new delta
exit_FAILURE - 7 +7
_exit_FAILURE - 7 +7
run 198 199 +1
restore_state_and_exit 114 115 +1
xbsd_write_bootstrap 399 397 -2
vfork_compressor 209 207 -2
sig_handler 12 10 -2
serial_ctl 154 152 -2
parse_args 1169 1167 -2
onintr 21 19 -2
make_new_session 493 491 -2
login_main 988 986 -2
gotsig 35 33 -2
do_iplink 1315 1313 -2
addgroup_main 397 395 -2
inetd_main 1911 1908 -3
------------------------------------------------------------------------------
(add/remove: 2/0 grow/shrink: 2/12 up/down: 16/-25) Total: -9 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/inetd.c | 4 | ||||
| -rw-r--r-- | networking/libiproute/iplink.c | 2 | ||||
| -rw-r--r-- | networking/libiproute/iptunnel.c | 2 | ||||
| -rw-r--r-- | networking/ping.c | 2 | ||||
| -rw-r--r-- | networking/slattach.c | 2 | ||||
| -rw-r--r-- | networking/telnetd.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/networking/inetd.c b/networking/inetd.c index fb2fbe323..e63edcd9d 100644 --- a/networking/inetd.c +++ b/networking/inetd.c @@ -1449,7 +1449,7 @@ int inetd_main(int argc UNUSED_PARAM, char **argv) else sep->se_builtin->bi_dgram_fn(ctrl, sep); if (pid) /* we did fork */ - _exit(EXIT_FAILURE); + _exit_FAILURE(); maybe_close(accepted_fd); continue; /* -> check next fd in fd set */ } @@ -1530,7 +1530,7 @@ int inetd_main(int argc UNUSED_PARAM, char **argv) /* eat packet in udp case */ if (sep->se_socktype != SOCK_STREAM) recv(0, line, LINE_SIZE, MSG_DONTWAIT); - _exit(EXIT_FAILURE); + _exit_FAILURE(); } /* for (sep = servtab...) */ } /* for (;;) */ } diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c index 68d199044..9eb0b4f5f 100644 --- a/networking/libiproute/iplink.c +++ b/networking/libiproute/iplink.c @@ -215,7 +215,7 @@ static void parse_address(char *dev, int hatype, int halen, char *lla, struct if alen = hatype == 1/*ARPHRD_ETHER*/ ? 14/*ETH_HLEN*/ : 19/*INFINIBAND_HLEN*/; alen = ll_addr_a2n((unsigned char *)(ifr->ifr_hwaddr.sa_data), alen, lla); if (alen < 0) - exit(EXIT_FAILURE); + exit_FAILURE(); if (alen != halen) { bb_error_msg_and_die("wrong address (%s) length: expected %d bytes", lla, halen); } diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c index c9fa632f3..1ec81c635 100644 --- a/networking/libiproute/iptunnel.c +++ b/networking/libiproute/iptunnel.c @@ -319,7 +319,7 @@ static void parse_args(char **argv, int cmd, struct ip_tunnel_parm *p) struct ip_tunnel_parm old_p; memset(&old_p, 0, sizeof(old_p)); if (do_get_ioctl(*argv, &old_p)) - exit(EXIT_FAILURE); + exit_FAILURE(); *p = old_p; } } diff --git a/networking/ping.c b/networking/ping.c index 9805695a1..b7e6955a9 100644 --- a/networking/ping.c +++ b/networking/ping.c @@ -247,7 +247,7 @@ struct globals { static void noresp(int ign UNUSED_PARAM) { printf("No response from %s\n", G.hostname); - exit(EXIT_FAILURE); + exit_FAILURE(); } static void ping4(len_and_sockaddr *lsa) diff --git a/networking/slattach.c b/networking/slattach.c index 6d2a252fc..16b4c9158 100644 --- a/networking/slattach.c +++ b/networking/slattach.c @@ -80,7 +80,7 @@ static void restore_state_and_exit(int exitcode) /* Restore line status */ if (tcsetattr_serial_or_warn(&G.saved_state)) - exit(EXIT_FAILURE); + exit_FAILURE(); if (ENABLE_FEATURE_CLEAN_UP) close(serial_fd); diff --git a/networking/telnetd.c b/networking/telnetd.c index 0805e464f..fb90e7f11 100644 --- a/networking/telnetd.c +++ b/networking/telnetd.c @@ -571,7 +571,7 @@ make_new_session( BB_EXECVP(G.loginpath, (char **)login_argv); /* _exit is safer with vfork, and we shouldn't send message * to remote clients anyway */ - _exit(EXIT_FAILURE); /*bb_perror_msg_and_die("execv %s", G.loginpath);*/ + _exit_FAILURE(); /*bb_perror_msg_and_die("execv %s", G.loginpath);*/ } #if ENABLE_FEATURE_TELNETD_STANDALONE |