aboutsummaryrefslogtreecommitdiff
path: root/dsf.c
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2023-04-20 14:06:43 +0100
committerSimon Tatham <anakin@pobox.com>2023-04-20 17:23:21 +0100
commit89c438e149a91fffa74b2669f7e0cd05abc3420f (patch)
treea307d0c2dde7c2868e32a840497d44051d9b4630 /dsf.c
parent7abf85a9c6b460698994d9cfa538b7b26fed5e87 (diff)
downloadpuzzles-89c438e149a91fffa74b2669f7e0cd05abc3420f.zip
puzzles-89c438e149a91fffa74b2669f7e0cd05abc3420f.tar.gz
puzzles-89c438e149a91fffa74b2669f7e0cd05abc3420f.tar.bz2
puzzles-89c438e149a91fffa74b2669f7e0cd05abc3420f.tar.xz
Declare all dsfs as a dedicated type name 'DSF'.
In this commit, 'DSF' is simply a typedef for 'int', so that the new declaration form 'DSF *' translates to the same type 'int *' that dsfs have always had. So all we're doing here is mechanically changing type declarations throughout the code.
Diffstat (limited to 'dsf.c')
-rw-r--r--dsf.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/dsf.c b/dsf.c
index 06c4f9c..6f75076 100644
--- a/dsf.c
+++ b/dsf.c
@@ -61,7 +61,7 @@ done:
sfree(inverse_elements);
}*/
-void dsf_init(int *dsf, int size)
+void dsf_init(DSF *dsf, int size)
{
int i;
@@ -74,12 +74,12 @@ 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)
+void dsf_copy(DSF *to, DSF *from, int size)
{
memcpy(to, from, size * sizeof(int));
}
-int *snew_dsf(int size)
+DSF *snew_dsf(int size)
{
int *ret;
@@ -91,26 +91,26 @@ int *snew_dsf(int size)
return ret;
}
-void dsf_free(int *dsf)
+void dsf_free(DSF *dsf)
{
sfree(dsf);
}
-int dsf_canonify(int *dsf, int index)
+int dsf_canonify(DSF *dsf, int index)
{
return edsf_canonify(dsf, index, NULL);
}
-void dsf_merge(int *dsf, int v1, int v2)
+void dsf_merge(DSF *dsf, int v1, int v2)
{
edsf_merge(dsf, v1, v2, false);
}
-int dsf_size(int *dsf, int index) {
+int dsf_size(DSF *dsf, int index) {
return dsf[dsf_canonify(dsf, index)] >> 2;
}
-int edsf_canonify(int *dsf, int index, bool *inverse_return)
+int edsf_canonify(DSF *dsf, int index, bool *inverse_return)
{
int start_index = index, canonical_index;
bool inverse = false;
@@ -152,7 +152,7 @@ int edsf_canonify(int *dsf, int index, bool *inverse_return)
return index;
}
-void edsf_merge(int *dsf, int v1, int v2, bool inverse)
+void edsf_merge(DSF *dsf, int v1, int v2, bool inverse)
{
bool i1, i2;