Use more portable exit failure status macro

[colorize.git] / colorize.c

diff --git a/colorize.c b/colorize.c
index 30d03bc1d1c3e65733f5bf8fc380b2f926c8a2f0..5729f0e24c56e3b48cac1e1fe6c6e7f4a3aa07ea 100644 (file)
--- a/colorize.c
+++ b/colorize.c
@@ -82,12 +82,12 @@
 #if !DEBUG
 # define MEM_ALLOC_FAIL() do {                                         \
     fprintf (stderr, "%s: memory allocation failure\n", program_name); \
-    exit (2);                                                          \
+    exit (EXIT_FAILURE);                                               \
 } while (false)
 #else
 # define MEM_ALLOC_FAIL_DEBUG(file, line) do {                                              \
     fprintf (stderr, "Memory allocation failure in source file %s, line %u\n", file, line); \
-    exit (2);                                                                               \
+    exit (EXIT_FAILURE);                                                                    \
 } while (false)
 #endif
 
@@ -408,6 +408,7 @@ print_version (void)
 #else
     const char *version = NULL;
 #endif
+    const char *version_prefix, *version_string;
     const char *c_flags;
     struct bytes_size bytes_size;
     bool debug;
@@ -421,10 +422,10 @@ print_version (void)
 #else
     debug = false;
 #endif
-    if (version)
-      printf ("colorize %s (compiled at %s, %s)\n", version, __DATE__, __TIME__);
-    else
-      printf ("colorize v%s (compiled at %s, %s)\n", VERSION, __DATE__, __TIME__);
+    version_prefix = version ? "" : "v";
+    version_string = version ? version : VERSION;
+    printf ("colorize %s%s (compiled at %s, %s)\n", version_prefix, version_string, __DATE__, __TIME__);
+
     printf ("Compiler flags: %s\n", c_flags);
     if (get_bytes_size (BUF_SIZE, &bytes_size))
       {