aboutsummaryrefslogtreecommitdiff
path: root/keen.c
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2023-04-20 13:35:58 +0100
committerSimon Tatham <anakin@pobox.com>2023-04-20 17:21:12 +0100
commitbb561ee3b18be69e52b17cedde50eac96ea409da (patch)
tree43b58f8e05550dfad4936e63cccb7ebe9a7c7ed5 /keen.c
parent16f997d34c7b435d3fcf5774c700579e188b017f (diff)
downloadpuzzles-bb561ee3b18be69e52b17cedde50eac96ea409da.zip
puzzles-bb561ee3b18be69e52b17cedde50eac96ea409da.tar.gz
puzzles-bb561ee3b18be69e52b17cedde50eac96ea409da.tar.bz2
puzzles-bb561ee3b18be69e52b17cedde50eac96ea409da.tar.xz
Use a dedicated free function to free dsfs.
No functional change: currently, this just wraps the previous sfree call.
Diffstat (limited to 'keen.c')
-rw-r--r--keen.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/keen.c b/keen.c
index cea8061..e886cbb 100644
--- a/keen.c
+++ b/keen.c
@@ -1284,7 +1284,7 @@ done
sfree(order);
sfree(revorder);
sfree(singletons);
- sfree(dsf);
+ dsf_free(dsf);
sfree(clues);
sfree(cluevals);
sfree(soln);
@@ -1310,12 +1310,12 @@ static const char *validate_desc(const game_params *params, const char *desc)
dsf = snew_dsf(a);
ret = parse_block_structure(&p, w, dsf);
if (ret) {
- sfree(dsf);
+ dsf_free(dsf);
return ret;
}
if (*p != ',') {
- sfree(dsf);
+ dsf_free(dsf);
return "Expected ',' after block structure description";
}
p++;
@@ -1330,21 +1330,21 @@ static const char *validate_desc(const game_params *params, const char *desc)
/* these clues need no validation */
} else if (*p == 'd' || *p == 's') {
if (dsf_size(dsf, i) != 2) {
- sfree(dsf);
+ dsf_free(dsf);
return "Subtraction and division blocks must have area 2";
}
} else if (!*p) {
- sfree(dsf);
+ dsf_free(dsf);
return "Too few clues for block structure";
} else {
- sfree(dsf);
+ dsf_free(dsf);
return "Unrecognised clue type";
}
p++;
while (*p && isdigit((unsigned char)*p)) p++;
}
}
- sfree(dsf);
+ dsf_free(dsf);
if (*p)
return "Too many clues for block structure";
@@ -1459,7 +1459,7 @@ static void free_game(game_state *state)
sfree(state->grid);
sfree(state->pencil);
if (--state->clues->refcount <= 0) {
- sfree(state->clues->dsf);
+ dsf_free(state->clues->dsf);
sfree(state->clues->clues);
sfree(state->clues);
}