aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-10-03 20:28:06 +0000
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-10-03 20:28:06 +0000
commit1fa12c6ebcb25e2924778bcbaae4bea1af7b7e6a (patch)
tree1bf7d7300ac410608a50b2c402966d492373ff24 /libbb
parentb816238d1a23646f04fe75c44fbb0a9da1eb1e76 (diff)
downloadbusybox-w32-1fa12c6ebcb25e2924778bcbaae4bea1af7b7e6a.tar.gz
busybox-w32-1fa12c6ebcb25e2924778bcbaae4bea1af7b7e6a.tar.bz2
busybox-w32-1fa12c6ebcb25e2924778bcbaae4bea1af7b7e6a.zip
rename bb_default_error_retval -> xfunc_error_retval
git-svn-id: svn://busybox.net/trunk/busybox@16304 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'libbb')
-rw-r--r--libbb/default_error_retval.c2
-rw-r--r--libbb/error_msg_and_die.c2
-rw-r--r--libbb/fflush_stdout_and_exit.c2
-rw-r--r--libbb/herror_msg_and_die.c2
-rw-r--r--libbb/perror_msg_and_die.c2
-rw-r--r--libbb/xfuncs.c2
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 @@
16#include <stdlib.h> 16#include <stdlib.h>
17#include "libbb.h" 17#include "libbb.h"
18 18
19int bb_default_error_retval = EXIT_FAILURE; 19int 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, ...)
24 va_end(p); 24 va_end(p);
25 if (die_sleep) 25 if (die_sleep)
26 sleep(die_sleep); 26 sleep(die_sleep);
27 exit(bb_default_error_retval); 27 exit(xfunc_error_retval);
28} 28}
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 @@
18void bb_fflush_stdout_and_exit(int retval) 18void bb_fflush_stdout_and_exit(int retval)
19{ 19{
20 if (fflush(stdout)) { 20 if (fflush(stdout)) {
21 retval = bb_default_error_retval; 21 retval = xfunc_error_retval;
22 } 22 }
23 if (die_sleep) 23 if (die_sleep)
24 sleep(die_sleep); 24 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, ...)
21 va_end(p); 21 va_end(p);
22 if (die_sleep) 22 if (die_sleep)
23 sleep(die_sleep); 23 sleep(die_sleep);
24 exit(bb_default_error_retval); 24 exit(xfunc_error_retval);
25} 25}
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, ...)
22 va_end(p); 22 va_end(p);
23 if (die_sleep) 23 if (die_sleep)
24 sleep(die_sleep); 24 sleep(die_sleep);
25 exit(bb_default_error_retval); 25 exit(xfunc_error_retval);
26} 26}
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)
414{ 414{
415 // copyfd outputs error messages for us. 415 // copyfd outputs error messages for us.
416 if (bb_copyfd_eof(fileno(file), 1) == -1) 416 if (bb_copyfd_eof(fileno(file), 1) == -1)
417 exit(bb_default_error_retval); 417 exit(xfunc_error_retval);
418 418
419 fclose(file); 419 fclose(file);
420} 420}