zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-20 23:51:29 -07:00
Code Issues Packages Projects Releases Wiki Activity

Adopt C99 bool in the edsf API.

Browse Source 
Now the flag passed to edsf_merge to say whether two items are the
same or opposite is a bool, and so is the flag returned via a pointer
argument from edsf_canonify.

The latter requires client code to be updated to match (otherwise
you'll get a pointer type error), so I've done that update in Loopy,
which is edsf's only current in-tree client.
This commit is contained in:
Simon Tatham
2018-11-13 21:39:45 +00:00
parent f6965b92e1
commit 20b56788bc
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dsf.c
View File

@ -15,7 +15,8 @@
int *equal_elements = snewn(size, int);
int *inverse_elements = snewn(size, int);
int printed_count = 0, equal_count, inverse_count;
int i, n, inverse;
int i, n;
bool inverse;
memset(printed_elements, -1, sizeof(int) * size);
@ -99,10 +100,10 @@ int dsf_size(int *dsf, int index) {
return dsf[dsf_canonify(dsf, index)] >> 2;
}
int edsf_canonify(int *dsf, int index, int *inverse_return)
int edsf_canonify(int *dsf, int index, bool *inverse_return)
{
int start_index = index, canonical_index;
int inverse = 0;
bool inverse = false;
/* fprintf(stderr, "dsf = %p\n", dsf); */
/* fprintf(stderr, "Canonify %2d\n", index); */
@ -141,9 +142,9 @@ int edsf_canonify(int *dsf, int index, int *inverse_return)
return index;
}
void edsf_merge(int *dsf, int v1, int v2, int inverse)
void edsf_merge(int *dsf, int v1, int v2, bool inverse)
{
int i1, i2;
bool i1, i2;
/* fprintf(stderr, "dsf = %p\n", dsf); */
/* fprintf(stderr, "Merge [%2d,%2d], %d\n", v1, v2, inverse); */