maint: move timeout exit statuses

* src/timeout.c (EXIT_TIMEDOUT, EXIT_CANCELED): Remove as
macros...
* src/system.h (EXIT_TIMEDOUT, EXIT_CANCELED): ...and provide as
enum values instead.
* src/stdbuf.c (EXIT_CANCELED): Delete.

diff --git a/src/stdbuf.c b/src/stdbuf.c
index 05a6b9fe8e5b62a007d95df4222ec78d44596c57..3930713544d9fd4b0e7664b30f2bf75cc38cfab6 100644 (file)
--- a/src/stdbuf.c
+++ b/src/stdbuf.c
@@ -37,9 +37,6 @@
 
 #define AUTHORS proper_name_utf8 ("Padraig Brady", "P\303\241draig Brady")
 
-/* Internal error  */
-enum { EXIT_CANCELED = 125 };
-
 static char *program_path;
 
 extern char **environ;

diff --git a/src/system.h b/src/system.h
index ce7114891bbb796b418597789a605e7a8321615a..f3e26a8354a0928d0eeaa289621e5579fc27ba03 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -107,8 +107,10 @@ you must include <sys/types.h> before including this file
 /* Exit statuses for programs like 'env' that exec other programs.  */
 enum
 {
-  EXIT_CANNOT_INVOKE = 126,
-  EXIT_ENOENT = 127
+  EXIT_TIMEDOUT = 124, /* Time expired before child completed.  */
+  EXIT_CANCELED = 125, /* Internal error prior to exec attempt.  */
+  EXIT_CANNOT_INVOKE = 126, /* Program located, but not usable.  */
+  EXIT_ENOENT = 127 /* Could not find program to exec.  */
 };
 
 #include "exitfail.h"

diff --git a/src/timeout.c b/src/timeout.c
index 7069f2c1ab872d9abe74abe10d318c1103923a69..7b0f1d7c56ae43fdf04cb7e01164b049753fce40 100644 (file)
--- a/src/timeout.c
+++ b/src/timeout.c
@@ -73,12 +73,6 @@
 
 #define AUTHORS proper_name_utf8 ("Padraig Brady", "P\303\241draig Brady")
 
-/* Note ETIMEDOUT is 110 on GNU/Linux systems but this is non standard */
-#define EXIT_TIMEDOUT 124
-
-/* Internal failure.  */
-#define EXIT_CANCELED 125
-
 static int timed_out;
 static int term_signal = SIGTERM;  /* same default as kill command.  */
 static int monitored_pid;