From 8131eea3dce5fba0dfb78e6083d1730423fad20b Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 2 Nov 2009 14:19:51 +0100 Subject: *: 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 --- util-linux/fsck_minix.c | 2 +- util-linux/mkfs_minix.c | 2 +- util-linux/more.c | 4 ++-- util-linux/rtcwake.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'util-linux') diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index cdd306031..cc9eec22d 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c @@ -341,7 +341,7 @@ static int ask(const char *string, int def) } printf(def ? "%s (y/n)? " : "%s (n/y)? ", string); for (;;) { - fflush(NULL); + fflush_all(); c = getchar(); if (c == EOF) { if (!def) diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index cf757610b..8819cee4e 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c @@ -505,7 +505,7 @@ static void alarm_intr(int alnum UNUSED_PARAM) if (!G.currently_testing) return; printf("%d ...", G.currently_testing); - fflush(stdout); + fflush_all(); } static void check_blocks(void) diff --git a/util-linux/more.c b/util-linux/more.c index 9ac4dd8e3..555f033d4 100644 --- a/util-linux/more.c +++ b/util-linux/more.c @@ -114,7 +114,7 @@ int more_main(int argc UNUSED_PARAM, char **argv) (int) (ftello(file)*100 / st.st_size), st.st_size); } - fflush(stdout); + fflush_all(); /* * We've just displayed the "--More--" prompt, so now we need @@ -189,7 +189,7 @@ int more_main(int argc UNUSED_PARAM, char **argv) putchar(c); } fclose(file); - fflush(stdout); + fflush_all(); } while (*argv && *++argv); end: setTermSettings(cin_fileno, &initial_settings); diff --git a/util-linux/rtcwake.c b/util-linux/rtcwake.c index f90f73ced..049f699f5 100644 --- a/util-linux/rtcwake.c +++ b/util-linux/rtcwake.c @@ -172,7 +172,7 @@ int rtcwake_main(int argc UNUSED_PARAM, char **argv) sync(); printf("wakeup from \"%s\" at %s", suspend, ctime(&alarm_time)); - fflush(NULL); + fflush_all(); usleep(10 * 1000); if (strcmp(suspend, "on")) -- cgit v1.2.3