shithub: puzzles

Download patch

ref: dbced097ac16973f648ad2f024cc2302fa187578
parent: 615a337e426c0dc598b0bcdd9aec6bcbc4c50d2c
author: Simon Tatham <anakin@pobox.com>
date: Sat Feb 18 02:06:27 EST 2023

Fix unused variable warnings from clang.

If you enable -DSTRICT=ON in cmake and also build with clang, it
reports a couple of variables set but not otherwise used. One was
genuinely unused ('loop_found' in loop_deductions in Loopy); the other
is used by debug statements that are usually but not always compiled
out.

--- a/lightup.c
+++ b/lightup.c
@@ -416,6 +416,8 @@
     int x, y;
     char c = '?';
 
+    (void)c; /* placate -Wunused-but-set-variable if debug() does nothing */
+
     for (y = 0; y < state->h; y++) {
         for (x = 0; x < state->w; x++) {
             c = '.';
--- a/loopy.c
+++ b/loopy.c
@@ -2713,7 +2713,6 @@
     game_state *state = sstate->state;
     grid *g = state->game_grid;
     int shortest_chainlen = g->num_dots;
-    bool loop_found = false;
     int dots_connected;
     bool progress = false;
     int i;
@@ -2726,7 +2725,7 @@
      */
     for (i = 0; i < g->num_edges; i++) {
         if (state->lines[i] == LINE_YES) {
-            loop_found |= merge_dots(sstate, i);
+            merge_dots(sstate, i);
             edgecount++;
         }
     }