rename bb_default_error_retval -> xfunc_error_retval

6 files changed, 6 insertions, 6 deletions

diff --git a/libbb/default_error_retval.c b/libbb/default_error_retval.c
index ff48a674a..f4e46a4b5 100644
--- a/libbb/default_error_retval.c
+++ b/libbb/default_error_retval.c
@@ -16,4 +16,4 @@
 #include <stdlib.h>
 #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 29a260bde..10d953513 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 245f50864..6df8dde13 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 f115c8e0a..f62ddd2ea 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 c1cfb956f..2303ba211 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 4aa1c3000..f1d4486c3 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);
 }