Use a dedicated copy function to copy dsfs.

Previously we were duplicating the contents of a dsf using straight-up
memcpy. Now there's a dsf_copy function wrapping the same memcpy.

For the moment, this still has to take a size parameter, because the
size isn't stored inside the dsf itself. But once we make a proper
data type, it will be.

5 files changed, 14 insertions, 9 deletions

diff --git a/bridges.c b/bridges.c
index bb66c20..e51bfe9 100644
--- a/bridges.c
+++ b/bridges.c
@@ -1551,7 +1551,7 @@ static bool solve_island_stage3(struct island *is, bool *didsth_r)
         maxb = -1;
         /* We have to squirrel the dsf away and restore it afterwards;
          * it is additive only, and can't be removed from. */
-        memcpy(ss->tmpdsf, ss->dsf, wh*sizeof(int));
+        dsf_copy(ss->tmpdsf, ss->dsf, wh);
         for (n = curr+1; n <= curr+spc; n++) {
             solve_join(is, i, n, false);
             map_update_possibles(is->state);
@@ -1567,7 +1567,7 @@ static bool solve_island_stage3(struct island *is, bool *didsth_r)
             }
         }
         solve_join(is, i, curr, false); /* put back to before. */
-        memcpy(ss->dsf, ss->tmpdsf, wh*sizeof(int));
+        dsf_copy(ss->dsf, ss->tmpdsf, wh);
 
         if (maxb != -1) {
             /*debug_state(is->state);*/
@@ -1636,7 +1636,7 @@ static bool solve_island_stage3(struct island *is, bool *didsth_r)
                                   is->adj.points[j].dx ? G_LINEH : G_LINEV);
         if (before[i] != 0) continue;  /* this idea is pointless otherwise */
 
-        memcpy(ss->tmpdsf, ss->dsf, wh*sizeof(int));
+        dsf_copy(ss->tmpdsf, ss->dsf, wh);
 
         for (j = 0; j < is->adj.npoints; j++) {
             spc = island_adjspace(is, true, missing, j);
@@ -1651,7 +1651,7 @@ static bool solve_island_stage3(struct island *is, bool *didsth_r)
 
         for (j = 0; j < is->adj.npoints; j++)
             solve_join(is, j, before[j], false);
-        memcpy(ss->dsf, ss->tmpdsf, wh*sizeof(int));
+        dsf_copy(ss->dsf, ss->tmpdsf, wh);
 
         if (got) {
             debug(("island at (%d,%d) must connect in direction (%d,%d) to"
diff --git a/dsf.c b/dsf.c
index f967ffb..06c4f9c 100644
--- a/dsf.c
+++ b/dsf.c
@@ -74,6 +74,11 @@ void dsf_init(int *dsf, int size)
      * bits are the number of elements in the tree.  */
 }
 
+void dsf_copy(int *to, int *from, int size)
+{
+    memcpy(to, from, size * sizeof(int));
+}
+
 int *snew_dsf(int size)
 {
     int *ret;
diff --git a/loopy.c b/loopy.c
index 70e1106..f06596e 100644
--- a/loopy.c
+++ b/loopy.c
@@ -457,8 +457,7 @@ static solver_state *dup_solver_state(const solver_state *sstate) {
 
     ret->dotdsf = snewn(num_dots, int);
     ret->looplen = snewn(num_dots, int);
-    memcpy(ret->dotdsf, sstate->dotdsf,
-           num_dots * sizeof(int));
+    dsf_copy(ret->dotdsf, sstate->dotdsf, num_dots);
     memcpy(ret->looplen, sstate->looplen,
            num_dots * sizeof(int));
 
@@ -487,8 +486,7 @@ static solver_state *dup_solver_state(const solver_state *sstate) {
 
     if (sstate->linedsf) {
         ret->linedsf = snewn(num_edges, int);
-        memcpy(ret->linedsf, sstate->linedsf,
-               num_edges * sizeof(int));
+        dsf_copy(ret->linedsf, sstate->linedsf, num_edges);
     } else {
         ret->linedsf = NULL;
     }
diff --git a/puzzles.h b/puzzles.h
index 6f03b1d..e2d2112 100644
--- a/puzzles.h
+++ b/puzzles.h
@@ -431,6 +431,8 @@ void dsf_free(int *dsf);
 
 void print_dsf(int *dsf, int size);
 
+void dsf_copy(int *to, int *from, int size);
+
 /* Return the canonical element of the equivalence class containing element
  * val.  If 'inverse' is non-NULL, this function will put into it a flag
  * indicating whether the canonical element is inverse to val. */
diff --git a/signpost.c b/signpost.c
index 306ac09..14f60ec 100644
--- a/signpost.c
+++ b/signpost.c
@@ -482,7 +482,7 @@ static void dup_game_to(game_state *to, const game_state *from)
     memcpy(to->next, from->next, to->n*sizeof(int));
     memcpy(to->prev, from->prev, to->n*sizeof(int));
 
-    memcpy(to->dsf, from->dsf, to->n*sizeof(int));
+    dsf_copy(to->dsf, from->dsf, to->n);
     memcpy(to->numsi, from->numsi, (to->n+1)*sizeof(int));
 }