Yet more constness

diff --git a/src/data/identifier.c b/src/data/identifier.c
index 4f38e84fc0b798c5794f8760bd5238bfd86d36f5..c6718a5e35d36a14ff7998a73efe7a6462b46a88 100644 (file)
--- a/src/data/identifier.c
+++ b/src/data/identifier.c
@@ -31,7 +31,7 @@
 
 
 /* Table of keywords. */
-const char *keywords[T_N_KEYWORDS + 1] = 
+const char *const keywords[T_N_KEYWORDS + 1] = 
   {
     "AND", "OR", "NOT",
     "EQ", "GE", "GT", "LE", "LT", "NE",
@@ -117,7 +117,7 @@ lex_id_match (const char *kw, const char *tok)
 int
 lex_id_to_token (const char *id, size_t len)
 {
-  const char **kwp;
+  const char *const *kwp;
 
   if (len < 2 || len > 4)
     return T_ID;

diff --git a/src/data/identifier.h b/src/data/identifier.h
index 53be9a7655048c7cabd12c15950bf3a6cd791f6b..ff4149c0c0c1090c2aee583e83eaf6f3e9b69a41 100644 (file)
--- a/src/data/identifier.h
+++ b/src/data/identifier.h
@@ -68,6 +68,6 @@ bool lex_id_match_len (const char *keyword_string, size_t keyword_len,
 bool lex_id_match (const char *keyword_string, const char *token_string);
 int lex_id_to_token (const char *id, size_t len);
 
-extern const char *keywords[T_N_KEYWORDS + 1] ;
+extern const char *const keywords[T_N_KEYWORDS + 1] ;
 
 #endif /* !lex_def_h */

diff --git a/src/language/utilities/set.q b/src/language/utilities/set.q
index 685b3152cbffa44b9581f25a0438fbaeef0ee635..113373d73787b5fa6918c8f9cc5f77016f3faf73 100644 (file)
--- a/src/language/utilities/set.q
+++ b/src/language/utilities/set.q
@@ -622,7 +622,7 @@ struct show_sbc
     void (*function) (void);
   };
 
-struct show_sbc show_table[] = 
+const struct show_sbc show_table[] = 
   {
     {"BLANKS", show_blanks},
     {"CCA", show_cca},

diff --git a/src/math/percentiles.c b/src/math/percentiles.c
index d00cf3e0eea4d28772f43dcd0138412d032f7e60..7fec4ce9d5e36871232654ad5e56d04847b351ff 100644 (file)
--- a/src/math/percentiles.c
+++ b/src/math/percentiles.c
@@ -39,7 +39,7 @@ struct ptile_params
 };
 
 
-const char *ptile_alg_desc[] = {
+const char *const ptile_alg_desc[] = {
   "",
   N_("HAverage"),
   N_("Weighted Average"),

diff --git a/src/math/percentiles.h b/src/math/percentiles.h
index efe26918b976272d05c6f4048372b8c1516b0028..d1271fa2acb5e573e3166dad99eeeddaf688f167 100644 (file)
--- a/src/math/percentiles.h
+++ b/src/math/percentiles.h
@@ -38,7 +38,7 @@ enum pc_alg {
 
 
 
-extern  const char *ptile_alg_desc[];
+extern  const char *const ptile_alg_desc[];
 
 
 

diff --git a/src/output/charts/plot-chart.c b/src/output/charts/plot-chart.c
index 8a1dc0bd1fbed3f5f3943dc41adb69935b7fce8f..4fd67aaf0bb915a1555f00452417ad1882f98484 100644 (file)
--- a/src/output/charts/plot-chart.c
+++ b/src/output/charts/plot-chart.c
@@ -41,7 +41,7 @@
 #include <output/output.h>
 
 
-const char *data_colour[] = {
+const char *const data_colour[] = {
   "brown",
   "red",
   "orange",

diff --git a/src/output/charts/plot-chart.h b/src/output/charts/plot-chart.h
index c7a1b2dfaa2cf528a439f85c839f173394b44761..f5bd6f385afcc877687eaad2f5e625710d0e15a0 100644 (file)
--- a/src/output/charts/plot-chart.h
+++ b/src/output/charts/plot-chart.h
@@ -40,7 +40,7 @@
 #define PLOT_CHART_H
 
                                                             
-extern const char *data_colour[];
+extern const char *const data_colour[];
 
 enum tick_orientation {
   TICK_ABSCISSA=0,