aboutsummaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2022-01-05 22:16:06 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2022-01-05 22:16:06 +0100
commitdb5546ca101846f18294a43b39883bc4ff53613a (patch)
treef8bb8a4835b70f4693dcf83edfa432c21d0ee77f /miscutils
parent076f5e064fa7b6cc2c03b030abcf2cbd60514180 (diff)
downloadbusybox-w32-db5546ca101846f18294a43b39883bc4ff53613a.tar.gz
busybox-w32-db5546ca101846f18294a43b39883bc4ff53613a.tar.bz2
busybox-w32-db5546ca101846f18294a43b39883bc4ff53613a.zip
libbb: code shrink: introduce and use [_]exit_SUCCESS()
function old new delta exit_SUCCESS - 7 +7 _exit_SUCCESS - 7 +7 run_pipe 1562 1567 +5 pseudo_exec_argv 399 400 +1 finish 86 87 +1 start_stop_daemon_main 1109 1107 -2 shutdown_on_signal 38 36 -2 runsv_main 1662 1660 -2 redirect 1070 1068 -2 read_line 79 77 -2 pause_and_low_level_reboot 54 52 -2 list_i2c_busses_and_exit 483 481 -2 less_exit 12 10 -2 identify 4123 4121 -2 grep_file 1161 1159 -2 getty_main 1519 1517 -2 fsck_minix_main 2681 2679 -2 free_session 132 130 -2 fdisk_main 4739 4737 -2 clean_up_and_exit 53 51 -2 bsd_select 1566 1564 -2 bb_daemonize_or_rexec 198 196 -2 ------------------------------------------------------------------------------ (add/remove: 2/0 grow/shrink: 3/17 up/down: 21/-34) Total: -13 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/devfsd.c4
-rw-r--r--miscutils/hdparm.c2
-rw-r--r--miscutils/i2c_tools.c2
-rw-r--r--miscutils/less.c4
-rw-r--r--miscutils/watchdog.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index e5bb8a2d8..839d00fd0 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -453,7 +453,7 @@ int devfsd_main(int argc, char **argv)
453 DEVFSD_PROTOCOL_REVISION_DAEMON, bb_msg_proto_rev, proto_rev); 453 DEVFSD_PROTOCOL_REVISION_DAEMON, bb_msg_proto_rev, proto_rev);
454 if (DEVFSD_PROTOCOL_REVISION_DAEMON != proto_rev) 454 if (DEVFSD_PROTOCOL_REVISION_DAEMON != proto_rev)
455 bb_error_msg_and_die("%s mismatch!", bb_msg_proto_rev); 455 bb_error_msg_and_die("%s mismatch!", bb_msg_proto_rev);
456 exit(EXIT_SUCCESS); /* -v */ 456 exit_SUCCESS(); /* -v */
457 } 457 }
458 /* Tell kernel we are special(i.e. we get to see hidden entries) */ 458 /* Tell kernel we are special(i.e. we get to see hidden entries) */
459 xioctl(fd, DEVFSDIOC_SET_EVENT_MASK, 0); 459 xioctl(fd, DEVFSDIOC_SET_EVENT_MASK, 0);
@@ -474,7 +474,7 @@ int devfsd_main(int argc, char **argv)
474 dir_operation(SERVICE, mount_point, 0, NULL); 474 dir_operation(SERVICE, mount_point, 0, NULL);
475 475
476 if (ENABLE_DEVFSD_FG_NP && no_polling) 476 if (ENABLE_DEVFSD_FG_NP && no_polling)
477 exit(EXIT_SUCCESS); 477 exit_SUCCESS();
478 478
479 if (ENABLE_DEVFSD_VERBOSE || ENABLE_DEBUG) 479 if (ENABLE_DEVFSD_VERBOSE || ENABLE_DEBUG)
480 logmode = LOGMODE_BOTH; 480 logmode = LOGMODE_BOTH;
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 01b4e8e2e..d8d8f6166 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -1271,7 +1271,7 @@ static void identify(uint16_t *val)
1271 } 1271 }
1272 } 1272 }
1273 1273
1274 exit(EXIT_SUCCESS); 1274 exit_SUCCESS();
1275} 1275}
1276#endif 1276#endif
1277 1277
diff --git a/miscutils/i2c_tools.c b/miscutils/i2c_tools.c
index b25d49792..e3741eeba 100644
--- a/miscutils/i2c_tools.c
+++ b/miscutils/i2c_tools.c
@@ -1212,7 +1212,7 @@ static void NORETURN list_i2c_busses_and_exit(void)
1212 } 1212 }
1213 } 1213 }
1214 1214
1215 exit(EXIT_SUCCESS); 1215 exit_SUCCESS();
1216} 1216}
1217 1217
1218static void NORETURN no_support(const char *cmd) 1218static void NORETURN no_support(const char *cmd)
diff --git a/miscutils/less.c b/miscutils/less.c
index 6825e5577..82c4b21f0 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -333,10 +333,10 @@ static void restore_tty(void)
333 clear_line(); 333 clear_line();
334} 334}
335 335
336static void less_exit(void) 336static NOINLINE void less_exit(void)
337{ 337{
338 restore_tty(); 338 restore_tty();
339 exit(EXIT_SUCCESS); 339 exit_SUCCESS();
340} 340}
341 341
342#if (ENABLE_FEATURE_LESS_DASHCMD && ENABLE_FEATURE_LESS_LINENUMS) \ 342#if (ENABLE_FEATURE_LESS_DASHCMD && ENABLE_FEATURE_LESS_LINENUMS) \
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index d8e9c78f5..9f5a4b849 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -76,7 +76,7 @@ static void shutdown_on_signal(int sig UNUSED_PARAM)
76{ 76{
77 remove_pidfile_std_path_and_ext("watchdog"); 77 remove_pidfile_std_path_and_ext("watchdog");
78 shutdown_watchdog(); 78 shutdown_watchdog();
79 _exit(EXIT_SUCCESS); 79 _exit_SUCCESS();
80} 80}
81 81
82static void watchdog_open(const char* device) 82static void watchdog_open(const char* device)