remove gratuitous renaming

Makefile

@@ -24,7 +24,7 @@ DOTOS = src/cpu.o \
 	src/dis.o \
 	src/disk_io.o \
 	src/disk_io_obj.o \
-	src/display.o \
+	src/x11_lcd.o \
 	src/emulator.o \
 	src/flash49.o \
 	src/hdw.o \

src/emulator.c

@@ -122,7 +122,7 @@ static char rcs_id[] = "$Id: emulator.c,v 4.1 2000/12/11 09:54:19 cibrario Rel $
 #include "machdep.h"
 #include "cpu.h"
 #include "modules.h"
-#include "display.h"
+#include "x11_lcd.h"
 #include "x11.h"
 #include "serial.h"
 #include "args.h"

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 */

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 );
             }
         }
     }

src/x11.c

@@ -209,7 +209,7 @@ static char rcs_id[] = "$Id: x11.c,v 4.1.1.1 2002/11/11 16:11:47 cibrario Exp $"
 #include "config.h"
 #include "machdep.h"
 #include "cpu.h"     /* EmulatorExit(); required by keyb.h, too */
-#include "display.h" /* LcdInit() */
+#include "x11_lcd.h" /* LcdInit() */
 #include "keyb.h"
 #include "serial.h"
 #include "x11.h"

src/x11_lcd.c

@@ -105,7 +105,7 @@ static char rcs_id[] = "$Id: display.c,v 4.1.1.1 2002/11/11 16:12:46 cibrario Ex
 #include "machdep.h"
 #include "cpu.h"
 #include "modules.h"
-#include "display.h"
+#include "x11_lcd.h"
 #include "x11.h"
 #include "debug.h"