Make the code base clean under -Wwrite-strings.

[sgt-puzzles.git] / unequal.c

diff --git a/unequal.c b/unequal.c
index 6342318b044507ba2286eeed24792e6e634b29dd..12d84bf80a41f79058651915b649cd84fb0a8cda 100644 (file)
--- a/unequal.c
+++ b/unequal.c
@@ -218,24 +218,21 @@ static config_item *game_configure(const game_params *params)
 
     ret[0].name = "Mode";
     ret[0].type = C_CHOICES;
-    ret[0].sval = ":Unequal:Adjacent";
-    ret[0].ival = params->adjacent;
+    ret[0].u.choices.choicenames = ":Unequal:Adjacent";
+    ret[0].u.choices.selected = params->adjacent;
 
     ret[1].name = "Size (s*s)";
     ret[1].type = C_STRING;
     sprintf(buf, "%d", params->order);
-    ret[1].sval = dupstr(buf);
-    ret[1].ival = 0;
+    ret[1].u.string.sval = dupstr(buf);
 
     ret[2].name = "Difficulty";
     ret[2].type = C_CHOICES;
-    ret[2].sval = DIFFCONFIG;
-    ret[2].ival = params->diff;
+    ret[2].u.choices.choicenames = DIFFCONFIG;
+    ret[2].u.choices.selected = params->diff;
 
     ret[3].name = NULL;
     ret[3].type = C_END;
-    ret[3].sval = NULL;
-    ret[3].ival = 0;
 
     return ret;
 }
@@ -244,14 +241,14 @@ static game_params *custom_params(const config_item *cfg)
 {
     game_params *ret = snew(game_params);
 
-    ret->adjacent = cfg[0].ival;
-    ret->order = atoi(cfg[1].sval);
-    ret->diff = cfg[2].ival;
+    ret->adjacent = cfg[0].u.choices.selected;
+    ret->order = atoi(cfg[1].u.string.sval);
+    ret->diff = cfg[2].u.choices.selected;
 
     return ret;
 }
 
-static char *validate_params(const game_params *params, int full)
+static const char *validate_params(const game_params *params, int full)
 {
     if (params->order < 3 || params->order > 32)
         return "Order must be between 3 and 32";
@@ -1198,12 +1195,12 @@ generate:
 }
 
 static game_state *load_game(const game_params *params, const char *desc,
-                             char **why_r)
+                             const char **why_r)
 {
     game_state *state = blank_game(params->order, params->adjacent);
     const char *p = desc;
     int i = 0, n, o = params->order, x, y;
-    char *why = NULL;
+    const char *why = NULL;
 
     while (*p) {
         while (*p >= 'a' && *p <= 'z') {
@@ -1294,9 +1291,9 @@ static game_state *new_game(midend *me, const game_params *params,
     return state;
 }
 
-static char *validate_desc(const game_params *params, const char *desc)
+static const char *validate_desc(const game_params *params, const char *desc)
 {
-    char *why = NULL;
+    const char *why = NULL;
     game_state *dummy = load_game(params, desc, &why);
     if (dummy) {
         free_game(dummy);
@@ -1307,7 +1304,7 @@ static char *validate_desc(const game_params *params, const char *desc)
 }
 
 static char *solve_game(const game_state *state, const game_state *currstate,
-                        const char *aux, char **error)
+                        const char *aux, const char **error)
 {
     game_state *solved;
     int r;
@@ -2042,7 +2039,7 @@ const char *quis = NULL;
 
 #if 0 /* currently unused */
 
-static void debug_printf(char *fmt, ...)
+static void debug_printf(const char *fmt, ...)
 {
     char buf[4096];
     va_list ap;
@@ -2126,7 +2123,7 @@ static int solve(game_params *p, char *desc, int debug)
 
 static void check(game_params *p)
 {
-    char *msg = validate_params(p, 1);
+    const char *msg = validate_params(p, 1);
     if (msg) {
         fprintf(stderr, "%s: %s", quis, msg);
         exit(1);
@@ -2234,7 +2231,8 @@ int main(int argc, const char *argv[])
         int i;
         for (i = 0; i < argc; i++) {
             const char *id = *argv++;
-            char *desc = strchr(id, ':'), *err;
+            char *desc = strchr(id, ':');
+            const char *err;
             p = default_params();
             if (desc) {
                 *desc++ = '\0';