[git commit] libbb: factor out fflush_stdout_and_exit(EXIT_SUCCESS)
Denys Vlasenko
vda.linux at googlemail.com
Tue Jan 4 22:31:58 UTC 2022
commit: https://git.busybox.net/busybox/commit/?id=31f45c1b369bee73843f7d791313423997618448
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master
function old new delta
fflush_stdout_and_exit_SUCCESS - 7 +7
xxd_main 890 888 -2
vlock_main 353 351 -2
uuencode_main 318 316 -2
uniq_main 427 425 -2
uname_main 250 248 -2
sort_main 853 851 -2
shuf_main 500 498 -2
route_main 238 236 -2
readlink_main 113 111 -2
nice_main 156 154 -2
last_main 957 955 -2
ipcs_main 960 958 -2
env_main 209 207 -2
chrt_main 464 462 -2
cal_main 921 919 -2
baseNUM_main 650 648 -2
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/16 up/down: 7/-32) Total: -25 bytes
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
coreutils/env.c | 2 +-
coreutils/nice.c | 2 +-
coreutils/readlink.c | 2 +-
coreutils/shuf.c | 2 +-
coreutils/sort.c | 2 +-
coreutils/uname.c | 2 +-
coreutils/uniq.c | 2 +-
coreutils/uudecode.c | 2 +-
coreutils/uuencode.c | 2 +-
include/libbb.h | 1 +
libbb/fflush_stdout_and_exit.c | 5 +++++
loginutils/vlock.c | 2 +-
networking/route.c | 2 +-
sysklogd/logread.c | 2 +-
util-linux/cal.c | 2 +-
util-linux/chrt.c | 2 +-
util-linux/hexdump_xxd.c | 2 +-
util-linux/ipcs.c | 8 ++++----
util-linux/last.c | 2 +-
util-linux/last_fancy.c | 2 +-
20 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/coreutils/env.c b/coreutils/env.c
index a0ea4dd27..6eafd06ef 100644
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -100,7 +100,7 @@ int env_main(int argc UNUSED_PARAM, char **argv)
}
}
- fflush_stdout_and_exit(EXIT_SUCCESS);
+ fflush_stdout_and_exit_SUCCESS();
}
/*
diff --git a/coreutils/nice.c b/coreutils/nice.c
index 28591ac61..e70da5d2b 100644
--- a/coreutils/nice.c
+++ b/coreutils/nice.c
@@ -33,7 +33,7 @@ int nice_main(int argc UNUSED_PARAM, char **argv)
if (!*++argv) { /* No args, so (GNU) output current nice value. */
printf("%d\n", old_priority);
- fflush_stdout_and_exit(EXIT_SUCCESS);
+ fflush_stdout_and_exit_SUCCESS();
}
adjustment = 10; /* Set default adjustment. */
diff --git a/coreutils/readlink.c b/coreutils/readlink.c
index 09d69df2b..b2e867883 100644
--- a/coreutils/readlink.c
+++ b/coreutils/readlink.c
@@ -96,5 +96,5 @@ int readlink_main(int argc UNUSED_PARAM, char **argv)
printf((opt & 2) ? "%s" : "%s\n", buf);
free(buf);
- fflush_stdout_and_exit(EXIT_SUCCESS);
+ fflush_stdout_and_exit_SUCCESS();
}
diff --git a/coreutils/shuf.c b/coreutils/shuf.c
index 3def3d80f..337366b45 100644
--- a/coreutils/shuf.c
+++ b/coreutils/shuf.c
@@ -171,5 +171,5 @@ int shuf_main(int argc, char **argv)
printf("%s%c", lines[i], eol);
}
- fflush_stdout_and_exit(EXIT_SUCCESS);
+ fflush_stdout_and_exit_SUCCESS();
}
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 32a06e40a..0cbb6f597 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -644,5 +644,5 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
printf("%s%c", lines[i], ch);
}
- fflush_stdout_and_exit(EXIT_SUCCESS);
+ fflush_stdout_and_exit_SUCCESS();
}
diff --git a/coreutils/uname.c b/coreutils/uname.c
index da785ab4c..6c0bdf096 100644
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -209,5 +209,5 @@ int uname_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
#endif
}
- fflush_stdout_and_exit(EXIT_SUCCESS); /* coreutils-6.9 compat */
+ fflush_stdout_and_exit_SUCCESS(); /* coreutils-6.9 compat */
}
diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index a3058ac07..06c57f750 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -139,5 +139,5 @@ int uniq_main(int argc UNUSED_PARAM, char **argv)
die_if_ferror(stdin, input_filename);
- fflush_stdout_and_exit(EXIT_SUCCESS);
+ fflush_stdout_and_exit_SUCCESS();
}
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index e90902f52..63a8d4d48 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -352,7 +352,7 @@ int baseNUM_main(int argc UNUSED_PARAM, char **argv)
#undef src_buf
}
- fflush_stdout_and_exit(EXIT_SUCCESS);
+ fflush_stdout_and_exit_SUCCESS();
}
#endif
diff --git a/coreutils/uuencode.c b/coreutils/uuencode.c
index db49ec80a..f096e3122 100644
--- a/coreutils/uuencode.c
+++ b/coreutils/uuencode.c
@@ -78,5 +78,5 @@ int uuencode_main(int argc UNUSED_PARAM, char **argv)
}
printf(tbl == bb_uuenc_tbl_std ? "\n`\nend\n" : "\n====\n");
- fflush_stdout_and_exit(EXIT_SUCCESS);
+ fflush_stdout_and_exit_SUCCESS();
}
diff --git a/include/libbb.h b/include/libbb.h
index a48782832..8308d6259 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1054,6 +1054,7 @@ void die_if_ferror(FILE *file, const char *msg) FAST_FUNC;
void die_if_ferror_stdout(void) FAST_FUNC;
int fflush_all(void) FAST_FUNC;
void fflush_stdout_and_exit(int retval) NORETURN FAST_FUNC;
+void fflush_stdout_and_exit_SUCCESS(void) NORETURN FAST_FUNC;
int fclose_if_not_stdin(FILE *file) FAST_FUNC;
FILE* xfopen(const char *filename, const char *mode) FAST_FUNC;
/* Prints warning to stderr and returns NULL on failure: */
diff --git a/libbb/fflush_stdout_and_exit.c b/libbb/fflush_stdout_and_exit.c
index 5df74170e..5a13ebcf8 100644
--- a/libbb/fflush_stdout_and_exit.c
+++ b/libbb/fflush_stdout_and_exit.c
@@ -20,3 +20,8 @@ void FAST_FUNC fflush_stdout_and_exit(int retval)
* but use xfunc_die() */
xfunc_die();
}
+
+void FAST_FUNC fflush_stdout_and_exit_SUCCESS(void)
+{
+ fflush_stdout_and_exit(EXIT_SUCCESS);
+}
diff --git a/loginutils/vlock.c b/loginutils/vlock.c
index 334b7d2ad..720835c4b 100644
--- a/loginutils/vlock.c
+++ b/loginutils/vlock.c
@@ -128,5 +128,5 @@ int vlock_main(int argc UNUSED_PARAM, char **argv)
ioctl(STDIN_FILENO, VT_SETMODE, &ovtm);
#endif
tcsetattr_stdin_TCSANOW(&oterm);
- fflush_stdout_and_exit(EXIT_SUCCESS);
+ fflush_stdout_and_exit_SUCCESS();
}
diff --git a/networking/route.c b/networking/route.c
index ff5daa8a7..26146f8e9 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -702,7 +702,7 @@ int route_main(int argc UNUSED_PARAM, char **argv)
#endif
bb_displayroutes(noresolve, opt & ROUTE_OPT_e);
- fflush_stdout_and_exit(EXIT_SUCCESS);
+ fflush_stdout_and_exit_SUCCESS();
}
/* Check verb. At the moment, must be add, del, or delete. */
diff --git a/sysklogd/logread.c b/sysklogd/logread.c
index d5f8ca0a2..e6cfcf4a7 100644
--- a/sysklogd/logread.c
+++ b/sysklogd/logread.c
@@ -226,5 +226,5 @@ int logread_main(int argc UNUSED_PARAM, char **argv)
/* shmdt(shbuf); - on Linux, shmdt is not mandatory on exit */
- fflush_stdout_and_exit(EXIT_SUCCESS);
+ fflush_stdout_and_exit_SUCCESS();
}
diff --git a/util-linux/cal.c b/util-linux/cal.c
index 6ba6ebf98..522ab3476 100644
--- a/util-linux/cal.c
+++ b/util-linux/cal.c
@@ -233,7 +233,7 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
}
}
- fflush_stdout_and_exit(EXIT_SUCCESS);
+ fflush_stdout_and_exit_SUCCESS();
}
/*
diff --git a/util-linux/chrt.c b/util-linux/chrt.c
index 6799abb2d..be96fa426 100644
--- a/util-linux/chrt.c
+++ b/util-linux/chrt.c
@@ -110,7 +110,7 @@ int chrt_main(int argc UNUSED_PARAM, char **argv)
show_min_max(SCHED_RR);
show_min_max(SCHED_BATCH);
show_min_max(SCHED_IDLE);
- fflush_stdout_and_exit(EXIT_SUCCESS);
+ fflush_stdout_and_exit_SUCCESS();
}
//if (opt & OPT_r)
// policy = SCHED_RR; - default, already set
diff --git a/util-linux/hexdump_xxd.c b/util-linux/hexdump_xxd.c
index 76dada983..4372ac770 100644
--- a/util-linux/hexdump_xxd.c
+++ b/util-linux/hexdump_xxd.c
@@ -150,7 +150,7 @@ static void reverse(unsigned opt, const char *filename)
free(buf);
}
//fclose(fp);
- fflush_stdout_and_exit(EXIT_SUCCESS);
+ fflush_stdout_and_exit_SUCCESS();
}
static void print_C_style(const char *p, const char *hdr)
diff --git a/util-linux/ipcs.c b/util-linux/ipcs.c
index ef2529c05..5973cbf57 100644
--- a/util-linux/ipcs.c
+++ b/util-linux/ipcs.c
@@ -600,15 +600,15 @@ int ipcs_main(int argc UNUSED_PARAM, char **argv)
id = xatoi(opt_i);
if (opt & flag_shm) {
print_shm(id);
- fflush_stdout_and_exit(EXIT_SUCCESS);
+ fflush_stdout_and_exit_SUCCESS();
}
if (opt & flag_sem) {
print_sem(id);
- fflush_stdout_and_exit(EXIT_SUCCESS);
+ fflush_stdout_and_exit_SUCCESS();
}
if (opt & flag_msg) {
print_msg(id);
- fflush_stdout_and_exit(EXIT_SUCCESS);
+ fflush_stdout_and_exit_SUCCESS();
}
bb_show_usage();
}
@@ -633,5 +633,5 @@ int ipcs_main(int argc UNUSED_PARAM, char **argv)
do_sem(format);
bb_putchar('\n');
}
- fflush_stdout_and_exit(EXIT_SUCCESS);
+ fflush_stdout_and_exit_SUCCESS();
}
diff --git a/util-linux/last.c b/util-linux/last.c
index 24ce7a8d8..63751ca45 100644
--- a/util-linux/last.c
+++ b/util-linux/last.c
@@ -162,5 +162,5 @@ int last_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
xlseek(file, pos, SEEK_SET);
}
- fflush_stdout_and_exit(EXIT_SUCCESS);
+ fflush_stdout_and_exit_SUCCESS();
}
diff --git a/util-linux/last_fancy.c b/util-linux/last_fancy.c
index e56e0ba85..648236229 100644
--- a/util-linux/last_fancy.c
+++ b/util-linux/last_fancy.c
@@ -296,5 +296,5 @@ int last_main(int argc UNUSED_PARAM, char **argv)
if (ENABLE_FEATURE_CLEAN_UP)
close(file);
- fflush_stdout_and_exit(EXIT_SUCCESS);
+ fflush_stdout_and_exit_SUCCESS();
}
More information about the busybox-cvs
mailing list