Make some arrays const.

libsrc/common/strftime.c

@@ -53,11 +53,11 @@
 size_t __fastcall__ strftime (char* buf, size_t bufsize, const char* format,
                               const struct tm* tm)
 {
-    static const char* days[7] = {
+    static const char* const days[7] = {
         "Sunday",   "Monday", "Tuesday", "Wednesday",
         "Thursday", "Friday", "Saturday"
     };
-    static const char* months[12] = {
+    static const char* const months[12] = {
         "January", "February", "March", "April", "May", "June",
         "July", "August", "September", "October", "November", "December"
     };

libsrc/conio/cputs.s

@@ -1,8 +1,8 @@
 ;
 ; Ullrich von Bassewitz, 06.08.1998
 ;
-; void cputsxy (unsigned char x, unsigned char y, char* s);
-; void cputs (char* s);
+; void cputsxy (unsigned char x, unsigned char y, const char* s);
+; void cputs (const char* s);
 ;
 
         .export         _cputsxy, _cputs

libsrc/dbg/dbg.c

@@ -32,7 +32,7 @@ static char DumpHandler (void);
 static char HelpHandler (void);
 
 /* Forwards for other functions */
-static void DisplayPrompt (char* s);
+static void DisplayPrompt (const char* s);
 static void SingleStep (char StepInto);
 static void RedrawStatic (char  Frame);
 static void Redraw (char Frame);
@@ -166,7 +166,7 @@ extern unsigned      DbgHI;             /* High 16 bit of primary reg */
 typedef struct {
     unsigned char x;
     unsigned char y;
-    char*         text;
+    const char*   text;
 } TextDesc;
 
 /* Window descriptor */
@@ -181,13 +181,13 @@ typedef struct {
     unsigned char fd_visible;           /* Is the window currently visible? */
     char (*fd_func) (void);             /* Handler function */
     unsigned char fd_textcount;         /* Number of text lines to print */
-    TextDesc*     fd_text;              /* Static text in the window */
+    const TextDesc* fd_text;            /* Static text in the window */
 } FrameDesc;
 
 
 
 /* Texts for the windows */
-static TextDesc RegText [] = {
+static const TextDesc RegText [] = {
     { 1,  0, "PC" },
     { 1,  1, "SR" },
     { 1,  2, "A"  },
@@ -197,7 +197,7 @@ static TextDesc RegText [] = {
     { 1,  6, "CS" },
     { 1,  7, "HI" }
 };
-static TextDesc HelpText [] = {
+static const TextDesc HelpText [] = {
     { 1,  0, "F1, ?     Help"                           },
     { 1,  1, "F2, t     Toggle breakpoint"              },
     { 1,  2, "F3, u     Run until subroutine returns"   },
@@ -220,7 +220,7 @@ static TextDesc HelpText [] = {
 
 
 /* Window data */
-static FrameDesc AsmFrame = {
+static const FrameDesc AsmFrame = {
     CH_ULCORNER, CH_TTEE, CH_LTEE, CH_CROSS,
     0, 0, MAX_X - 10, 15,
     MAX_X - 11, 14,
@@ -228,7 +228,7 @@ static FrameDesc AsmFrame = {
     AsmHandler,
     0, 0
 };
-static FrameDesc RegFrame = {
+static const FrameDesc RegFrame = {
     CH_TTEE, CH_URCORNER, CH_LTEE, CH_RTEE,
     MAX_X - 10, 0, MAX_X - 1, 9,
     8, 8,
@@ -236,7 +236,7 @@ static FrameDesc RegFrame = {
     RegHandler,
     sizeof (RegText) / sizeof (RegText [0]), RegText
 };
-static FrameDesc StackFrame = {
+static const FrameDesc StackFrame = {
     CH_LTEE, CH_RTEE, CH_CROSS, CH_RTEE,
     MAX_X - 10, 9, MAX_X - 1, 15,
     8, 5,
@@ -244,7 +244,7 @@ static FrameDesc StackFrame = {
     StackHandler,
     0, 0
 };
-static FrameDesc CStackFrame = {
+static const FrameDesc CStackFrame = {
     CH_CROSS, CH_RTEE, CH_BTEE, CH_LRCORNER,
     MAX_X - 10, 15, MAX_X - 1, MAX_Y - 1,
     8, MAX_Y - 17,
@@ -252,7 +252,7 @@ static FrameDesc CStackFrame = {
     CStackHandler,
     0, 0
 };
-static FrameDesc DumpFrame = {
+static const FrameDesc DumpFrame = {
     CH_LTEE, CH_CROSS, CH_LLCORNER, CH_BTEE,
     0, 15, MAX_X - 10, MAX_Y-1,
     MAX_X - 11, MAX_Y - 17,
@@ -260,7 +260,7 @@ static FrameDesc DumpFrame = {
     DumpHandler,
     0, 0
 };
-static FrameDesc HelpFrame = {
+static const FrameDesc HelpFrame = {
     CH_ULCORNER, CH_URCORNER, CH_LLCORNER, CH_LRCORNER,
     0, 0, MAX_X - 1, MAX_Y-1,
     MAX_X - 2, MAX_Y - 2,
@@ -268,7 +268,7 @@ static FrameDesc HelpFrame = {
     HelpHandler,
     sizeof (HelpText) / sizeof (HelpText [0]), HelpText
 };
-static FrameDesc* Frames [] = {
+static const FrameDesc* const Frames [] = {
     &AsmFrame,
     &RegFrame,
     &StackFrame,
@@ -297,7 +297,7 @@ static unsigned char StackAddr; /* Start address of output */
 
 
 /* Prompt line data */
-static char* ActivePrompt = 0;  /* Last prompt line displayed */
+static const char* ActivePrompt = 0;  /* Last prompt line displayed */
 static char PromptColor;        /* Color behind prompt */
 static char PromptLength;       /* Length of current prompt string */
 
@@ -346,10 +346,10 @@ BreakPoint* DbgIsBreak (unsigned Addr);
 
 
 
-static void DrawFrame (register FrameDesc* F, char Active)
+static void DrawFrame (register const FrameDesc* F, char Active)
 /* Draw one window frame */
 {
-    TextDesc* T;
+    const TextDesc* T;
     unsigned char Count;
     unsigned char tl, tr, bl, br;
     unsigned char x1, y1, width;
@@ -410,7 +410,7 @@ static void DrawFrames (void)
 /* Draw all frames */
 {
     unsigned char I;
-    FrameDesc* F;
+    const FrameDesc* F;
 
     /* Build the frame layout of the screen */
     for (I = 0; I < sizeof (Frames) / sizeof (Frames [0]); ++I) {
@@ -427,7 +427,7 @@ static void ActivateFrame (int Num, unsigned char Clear)
 /* Activate a new frame, deactivate the old one */
 {
     unsigned char y;
-    register FrameDesc* F;
+    register const FrameDesc* F;
 
     if (ActiveFrame != Num) {
 
@@ -462,7 +462,7 @@ static void ActivateFrame (int Num, unsigned char Clear)
 
 
 
-static void DisplayPrompt (char* s)
+static void DisplayPrompt (const char* s)
 /* Display a prompt */
 {
     unsigned char OldColor;
@@ -626,11 +626,11 @@ static char InputHex (char* Prompt, unsigned* Val)
 
 
 
-static void ErrorPrompt (char* Msg)
+static void ErrorPrompt (const char* Msg)
 /* Display an error message and wait for a key */
 {
     /* Save the current prompt */
-    char* OldPrompt = ActivePrompt;
+    const char* OldPrompt = ActivePrompt;
 
     /* Display the new one */
     DisplayPrompt (Msg);

libsrc/geos-common/dlgbox/messagebox.c

@@ -10,21 +10,21 @@
 
 void _mbprintout(void);
 
-static dlgBoxStr _mbdlg_EMPTY = {
+static const dlgBoxStr _mbdlg_EMPTY = {
         DB_DEFPOS(1),
         DB_OPVEC(&RstrFrmDialogue),
         DB_USRROUT(&_mbprintout),
         DB_END,
 };
 
-static dlgBoxStr _mbdlg_OK = {
+static const dlgBoxStr _mbdlg_OK = {
         DB_DEFPOS(1),
         DB_USRROUT(&_mbprintout),
         DB_ICON(OK, DBI_X_1, DBI_Y_2),
         DB_END,
 };
 
-static dlgBoxStr _mbdlg_OKCANCEL = {
+static const dlgBoxStr _mbdlg_OKCANCEL = {
         DB_DEFPOS(1),
         DB_USRROUT(&_mbprintout),
         DB_ICON(OK, DBI_X_0, DBI_Y_2),
@@ -32,7 +32,7 @@ static dlgBoxStr _mbdlg_OKCANCEL = {
         DB_END,
 };
 
-static dlgBoxStr _mbdlg_YESNO = {
+static const dlgBoxStr _mbdlg_YESNO = {
         DB_DEFPOS(1),
         DB_USRROUT(&_mbprintout),
         DB_ICON(YES, DBI_X_0, DBI_Y_2),
@@ -40,7 +40,7 @@ static dlgBoxStr _mbdlg_YESNO = {
         DB_END,
 };
 
-static dlgBoxStr *_mbboxes[] = {
+static const dlgBoxStr * const _mbboxes[] = {
         &_mbdlg_EMPTY,
         &_mbdlg_OK,
         &_mbdlg_OKCANCEL,