emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbb: factor out fflush_stdout_and_exit(EXIT_SUCCESS)

Browse Source 
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@googlemail.com>
This commit is contained in:
Denys Vlasenko 2022-01-04 23:31:58 +01:00
parent 286b33721d
commit 31f45c1b36
20 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coreutils/env.c
View File

@ -100,7 +100,7 @@ int env_main(int argc UNUSED_PARAM, char **argv)
}
}
fflush_stdout_and_exit(EXIT_SUCCESS);
fflush_stdout_and_exit_SUCCESS();
}
/*

2
coreutils/nice.c
View File

@ -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. */

2
coreutils/readlink.c
View File

@ -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();
}

2
coreutils/shuf.c
View File

@ -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();
}

2
coreutils/sort.c
View File

@ -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();
}

2
coreutils/uname.c
View File

@ -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 */
}

2
coreutils/uniq.c
View File

@ -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();
}

2
coreutils/uudecode.c
View File

@ -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

2
coreutils/uuencode.c
View File

@ -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();
}

1
include/libbb.h
View File

@ -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: */

5
libbb/fflush_stdout_and_exit.c
View File

@ -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);
}

2
loginutils/vlock.c
View File

@ -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();
}

2
networking/route.c
View File

@ -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. */

2
sysklogd/logread.c
View File

@ -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();
}

2
util-linux/cal.c
View File

@ -233,7 +233,7 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
}
}
fflush_stdout_and_exit(EXIT_SUCCESS);
fflush_stdout_and_exit_SUCCESS();
}
/*

2
util-linux/chrt.c
View File

@ -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

2
util-linux/hexdump_xxd.c
View File

@ -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)

8
util-linux/ipcs.c
View File

@ -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();
}

2
util-linux/last.c
View File

@ -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();
}

2
util-linux/last_fancy.c
View File

@ -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();
}