diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-11-02 14:19:51 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-11-02 14:19:51 +0100 |
| commit | 8131eea3dce5fba0dfb78e6083d1730423fad20b (patch) | |
| tree | c098d7ba6ef9f4745425a29a330480e6088d6d9a /libbb/xfuncs_printf.c | |
| parent | 0d8ea64af618dc83c3291b3b598636ed3d0854e4 (diff) | |
| download | busybox-8131eea3dce5fba0dfb78e6083d1730423fad20b.tar.gz | |
*: introduce and use ffulsh_all()
function old new delta
buffer_fill_and_print 179 196 +17
fflush_all - 9 +9
spawn 87 92 +5
rtcwake_main 455 453 -2
...
alarm_intr 93 84 -9
readcmd 1072 1062 -10
bb_ask 345 333 -12
more_main 845 832 -13
flush_stdout_stderr 42 23 -19
xfflush_stdout 27 - -27
flush_stderr 30 - -30
------------------------------------------------------------------------------
(add/remove: 1/2 grow/shrink: 2/50 up/down: 31/-397) Total: -366 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb/xfuncs_printf.c')
| -rw-r--r-- | libbb/xfuncs_printf.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c index 241887ace..644134a0e 100644 --- a/libbb/xfuncs_printf.c +++ b/libbb/xfuncs_printf.c @@ -255,12 +255,9 @@ void FAST_FUNC die_if_ferror_stdout(void) die_if_ferror(stdout, bb_msg_standard_output); } -// Die with an error message if we have trouble flushing stdout. -void FAST_FUNC xfflush_stdout(void) +int FAST_FUNC fflush_all(void) { - if (fflush(stdout)) { - bb_perror_msg_and_die(bb_msg_standard_output); - } + return fflush(NULL); } @@ -276,9 +273,9 @@ int FAST_FUNC bb_putchar(int ch) * then close that file. */ void FAST_FUNC xprint_and_close_file(FILE *file) { - fflush(stdout); + fflush_all(); // copyfd outputs error messages for us. - if (bb_copyfd_eof(fileno(file), 1) == -1) + if (bb_copyfd_eof(fileno(file), STDOUT_FILENO) == -1) xfunc_die(); fclose(file); |