From 40920825d59874cf285390434486e88c8498d2d8 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Tue, 3 Oct 2006 20:28:06 +0000 Subject: rename bb_default_error_retval -> xfunc_error_retval --- libbb/default_error_retval.c | 2 +- libbb/error_msg_and_die.c | 2 +- libbb/fflush_stdout_and_exit.c | 2 +- libbb/herror_msg_and_die.c | 2 +- libbb/perror_msg_and_die.c | 2 +- libbb/xfuncs.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libbb') diff --git a/libbb/default_error_retval.c b/libbb/default_error_retval.c index ff48a67..f4e46a4 100644 --- a/libbb/default_error_retval.c +++ b/libbb/default_error_retval.c @@ -16,4 +16,4 @@ #include #include "libbb.h" -int bb_default_error_retval = EXIT_FAILURE; +int xfunc_error_retval = EXIT_FAILURE; diff --git a/libbb/error_msg_and_die.c b/libbb/error_msg_and_die.c index 29a260b..10d9535 100644 --- a/libbb/error_msg_and_die.c +++ b/libbb/error_msg_and_die.c @@ -24,5 +24,5 @@ void bb_error_msg_and_die(const char *s, ...) va_end(p); if (die_sleep) sleep(die_sleep); - exit(bb_default_error_retval); + exit(xfunc_error_retval); } diff --git a/libbb/fflush_stdout_and_exit.c b/libbb/fflush_stdout_and_exit.c index 245f508..6df8dde 100644 --- a/libbb/fflush_stdout_and_exit.c +++ b/libbb/fflush_stdout_and_exit.c @@ -18,7 +18,7 @@ void bb_fflush_stdout_and_exit(int retval) { if (fflush(stdout)) { - retval = bb_default_error_retval; + retval = xfunc_error_retval; } if (die_sleep) sleep(die_sleep); diff --git a/libbb/herror_msg_and_die.c b/libbb/herror_msg_and_die.c index f115c8e..f62ddd2 100644 --- a/libbb/herror_msg_and_die.c +++ b/libbb/herror_msg_and_die.c @@ -21,5 +21,5 @@ void bb_herror_msg_and_die(const char *s, ...) va_end(p); if (die_sleep) sleep(die_sleep); - exit(bb_default_error_retval); + exit(xfunc_error_retval); } diff --git a/libbb/perror_msg_and_die.c b/libbb/perror_msg_and_die.c index c1cfb95..2303ba2 100644 --- a/libbb/perror_msg_and_die.c +++ b/libbb/perror_msg_and_die.c @@ -22,5 +22,5 @@ void bb_perror_msg_and_die(const char *s, ...) va_end(p); if (die_sleep) sleep(die_sleep); - exit(bb_default_error_retval); + exit(xfunc_error_retval); } diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index 4aa1c30..f1d4486 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c @@ -414,7 +414,7 @@ void xprint_and_close_file(FILE *file) { // copyfd outputs error messages for us. if (bb_copyfd_eof(fileno(file), 1) == -1) - exit(bb_default_error_retval); + exit(xfunc_error_retval); fclose(file); } -- cgit v1.1