From a9e3177a484ddd4105a4afffea6bffc42cdbce69 Mon Sep 17 00:00:00 2001
From: Gwenhael Le Moine <gwenhael.le.moine@gmail.com>
Date: Wed, 18 Sep 2024 15:37:09 +0200
Subject: [PATCH] remove gratuitous renaming

---
 src/main.c | 10 ++++------
 src/pack.c | 12 +++++-------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/main.c b/src/main.c
index 6352183..91e0e09 100644
--- a/src/main.c
+++ b/src/main.c
@@ -125,12 +125,10 @@ static char rcs_id[] = "$Id: saturn.c,v 4.1 2000/12/11 09:54:19 cibrario Rel $";
 
 /*---------------------------------------------------------------------------
    Chf parameters - Do not change.
-   The ABNORMAL_EXIT_CODE is taken from stdlib.h (EXIT_FAILURE)
   ---------------------------------------------------------------------------*/
 
 #define CONDITION_STACK_SIZE 16
 #define HANDLER_STACK_SIZE 8
-#define ABNORMAL_EXIT_CODE EXIT_FAILURE
 
 /* Conditional prefix and mandatory suffix to make a message catalog
    name from argv[0]
@@ -185,7 +183,7 @@ int main( int argc, char* argv[] )
 
     if ( ( cat_name = malloc( strlen( argv[ 0 ] ) + CAT_PREFIX_LEN + CAT_SUFFIX_LEN + 1 ) ) == NULL ) {
         fprintf( stderr, "saturn-E-cat_name initialization failed\n" );
-        exit( ABNORMAL_EXIT_CODE );
+        exit( EXIT_FAILURE );
     }
 
     /* Generate catalog name, without optional prefix */
@@ -207,7 +205,7 @@ int main( int argc, char* argv[] )
                                    cat_name,             /* Name of the message catalog */
                                    CONDITION_STACK_SIZE, /* Size of the condition stack */
                                    HANDLER_STACK_SIZE,   /* Size of the handler stack */
-                                   ABNORMAL_EXIT_CODE    /* Abnormal exit code */
+                                   EXIT_FAILURE          /* Abnormal exit code */
                                    ) ) != CHF_S_OK ||
              ChfGetMessage( CHF_MODULE_ID, MAIN_M_COPYRIGHT, NULL ) == NULL )
             fprintf( stderr, "saturn-E-Primary Chf initialization failed (%d)\n", st );
@@ -228,7 +226,7 @@ int main( int argc, char* argv[] )
                                    cat_name,             /* Name of the message catalog */
                                    CONDITION_STACK_SIZE, /* Size of the condition stack */
                                    HANDLER_STACK_SIZE,   /* Size of the handler stack */
-                                   ABNORMAL_EXIT_CODE    /* Abnormal exit code */
+                                   EXIT_FAILURE          /* Abnormal exit code */
                                    ) ) != CHF_S_OK ||
              ChfGetMessage( CHF_MODULE_ID, MAIN_M_COPYRIGHT, NULL ) == NULL )
             fprintf( stderr, "saturn-E-Alternate Chf initialization failed (%d)\n", st );
@@ -246,7 +244,7 @@ int main( int argc, char* argv[] )
 
     if ( retry == 2 ) {
         fprintf( stderr, "saturn-F-Application aborted\n" );
-        exit( ABNORMAL_EXIT_CODE );
+        exit( EXIT_FAILURE );
     }
 
     /* cat_name no longer needed */
diff --git a/src/pack.c b/src/pack.c
index 949fafa..e92b9df 100644
--- a/src/pack.c
+++ b/src/pack.c
@@ -93,12 +93,10 @@ static char rcs_id[] = "$Id";
 
 /*---------------------------------------------------------------------------
    Chf parameters - Do not change.
-   The ABNORMAL_EXIT_CODE is taken from stdlib.h (EXIT_FAILURE)
   ---------------------------------------------------------------------------*/
 
 #define CONDITION_STACK_SIZE 16
 #define HANDLER_STACK_SIZE 8
-#define ABNORMAL_EXIT_CODE EXIT_FAILURE
 
 /* Conditional prefix and mandatory suffix to make a message catalog
    name from cat_base_name.
@@ -150,7 +148,7 @@ int main( int argc, char* argv[] )
 
     if ( ( cat_name = malloc( sizeof( cat_base_name ) + CAT_PREFIX_LEN + CAT_SUFFIX_LEN + 1 ) ) == NULL ) {
         fprintf( stderr, "Cat_name initialization failed\n" );
-        exit( ABNORMAL_EXIT_CODE );
+        exit( EXIT_FAILURE );
     }
 
     /* Generate catalog name, without optional prefix */
@@ -167,12 +165,12 @@ int main( int argc, char* argv[] )
                                cat_name,             /* Name of the message catalog */
                                CONDITION_STACK_SIZE, /* Size of the condition stack */
                                HANDLER_STACK_SIZE,   /* Size of the handler stack */
-                               ABNORMAL_EXIT_CODE    /* Abnormal exit code */
+                               EXIT_FAILURE          /* Abnormal exit code */
                                ) ) != CHF_S_OK ||
          ChfGetMessage( CHF_MODULE_ID, UTIL_I_PACK_USAGE, NULL ) == NULL ) {
         if ( st != CHF_S_OK && st != CHF_F_CATOPEN ) {
             fprintf( stderr, "Chf initialization failed\n" );
-            exit( ABNORMAL_EXIT_CODE );
+            exit( EXIT_FAILURE );
         } else {
             fprintf( stderr, "Default message catalog open failed; trying alternate\n" );
 
@@ -190,11 +188,11 @@ int main( int argc, char* argv[] )
                                        cat_name,             /* Name of the message catalog */
                                        CONDITION_STACK_SIZE, /* Size of the condition stack */
                                        HANDLER_STACK_SIZE,   /* Size of the handler stack */
-                                       ABNORMAL_EXIT_CODE    /* Abnormal exit code */
+                                       EXIT_FAILURE          /* Abnormal exit code */
                                        ) ) != CHF_S_OK ||
                  ChfGetMessage( CHF_MODULE_ID, UTIL_I_PACK_USAGE, NULL ) == NULL ) {
                 fprintf( stderr, "Alternate Chf initialization failed\n" );
-                exit( ABNORMAL_EXIT_CODE );
+                exit( EXIT_FAILURE );
             }
         }
     }