Some type fixes and some cleanup

11 files changed, 11 insertions, 9 deletions

diff --git a/test/075_set_eo/set_eo_tests.c b/test/075_set_eo/set_eo_tests.c
index 08c8ae8..cd4868c 100644
--- a/test/075_set_eo/set_eo_tests.c
+++ b/test/075_set_eo/set_eo_tests.c
@@ -22,9 +22,11 @@ int main(void) {
                 printf("Error setting EO\n");
         } else if (!isconsistent(cube)) {
                 fprintf(stderr, "edges: ");
-                for (int i = 0; i < 12; i++) fprintf(stderr, "%d ", cube.edge[i]);
+                for (int i = 0; i < 12; i++)
+                        fprintf(stderr, "%d ", cube.edge[i]);
                 fprintf(stderr, "\n");
-                for (int i = 0; i < 8; i++) fprintf(stderr, "%d ", cube.corner[i]);
+                for (int i = 0; i < 8; i++)
+                        fprintf(stderr, "%d ", cube.corner[i]);
                 fprintf(stderr, "\n");
                 printf("Setting EO resulted in inconsistent cube\n");
         } else {
diff --git a/test/100_gendata_cocsep/gendata_cocsep_tests.c b/test/100_gendata_cocsep/gendata_cocsep_tests.c
index 4e0dce5..bba261b 100644
--- a/test/100_gendata_cocsep/gendata_cocsep_tests.c
+++ b/test/100_gendata_cocsep/gendata_cocsep_tests.c
@@ -1,6 +1,6 @@
 #include "../test.h"
 
-#define COCSEP_CLASSES 3393U
+#define COCSEP_CLASSES 3393
 
 size_t gendata_cocsep(void *, uint64_t *, cube_fast_t *);
 
diff --git a/test/101_cocsep_selfsim/cocsep_selfsim_tests.c b/test/101_cocsep_selfsim/cocsep_selfsim_tests.c
index 3fc7a60..02b5377 100644
--- a/test/101_cocsep_selfsim/cocsep_selfsim_tests.c
+++ b/test/101_cocsep_selfsim/cocsep_selfsim_tests.c
@@ -7,7 +7,7 @@
  */
 #include "../test.h"
 
-#define COCSEP_CLASSES 3393U
+#define COCSEP_CLASSES 3393
 
 size_t gendata_cocsep(void *, uint64_t *, cube_fast_t *);
 int64_t coord_fast_cocsep(cube_fast_t);
@@ -27,10 +27,10 @@ int main(void) {
                 fast = cubetofast(readcube("H48", str));
                 coord = coord_fast_cocsep(fast);
                 data = buf[coord];
-                coclass = (data & (0xFFFU << 16U)) >> 16U;
+                coclass = (data & (0xFFFU << 16)) >> 16;
                 sim = selfsim[coclass];
-                for (t = 0; t < 48 && sim; t++, sim >>= 1ULL) {
-                        if (sim & 1ULL)
+                for (t = 0; t < 48 && sim; t++, sim >>= 1) {
+                        if (sim & 1)
                                 printf("%" PRId64 " ", t);
                 }
                 printf("\n");
diff --git a/test/101_coord_invcoord_h48/00_all.in b/test/102_coord_invcoord_h48/00_all.in
index a2f9540..a2f9540 100644
--- a/test/101_coord_invcoord_h48/00_all.in
+++ b/test/102_coord_invcoord_h48/00_all.in
diff --git a/test/101_coord_invcoord_h48/00_all.out b/test/102_coord_invcoord_h48/00_all.out
index e84be4b..e84be4b 100644
--- a/test/101_coord_invcoord_h48/00_all.out
+++ b/test/102_coord_invcoord_h48/00_all.out
diff --git a/test/101_coord_invcoord_h48/coord_invcoord_h48_tests.c b/test/102_coord_invcoord_h48/coord_invcoord_h48_tests.c
index e7858df..5022608 100644
--- a/test/101_coord_invcoord_h48/coord_invcoord_h48_tests.c
+++ b/test/102_coord_invcoord_h48/coord_invcoord_h48_tests.c
@@ -1,6 +1,6 @@
 #include "../test.h"
 
-#define COCSEP_CLASSES 3393U
+#define COCSEP_CLASSES 3393
 
 size_t gendata_cocsep(void *, uint64_t *, cube_fast_t *);
 int64_t coord_h48(cube_fast_t, const uint32_t *, uint8_t);
diff --git a/test/102_gendata_h48/00_h_0.in b/test/103_gendata_h48/00_h_0.in
index 573541a..573541a 100644
--- a/test/102_gendata_h48/00_h_0.in
+++ b/test/103_gendata_h48/00_h_0.in
diff --git a/test/102_gendata_h48/00_h_0.out b/test/103_gendata_h48/00_h_0.out
index db6e121..db6e121 100644
--- a/test/102_gendata_h48/00_h_0.out
+++ b/test/103_gendata_h48/00_h_0.out
diff --git a/test/102_gendata_h48/01_h_1.in b/test/103_gendata_h48/01_h_1.in
index d00491f..d00491f 100644
--- a/test/102_gendata_h48/01_h_1.in
+++ b/test/103_gendata_h48/01_h_1.in
diff --git a/test/102_gendata_h48/01_h_1.out b/test/103_gendata_h48/01_h_1.out
index 456305d..456305d 100644
--- a/test/102_gendata_h48/01_h_1.out
+++ b/test/103_gendata_h48/01_h_1.out
diff --git a/test/102_gendata_h48/gendata_h48_tests.c b/test/103_gendata_h48/gendata_h48_tests.c
index 9d96e75..f0910cc 100644
--- a/test/102_gendata_h48/gendata_h48_tests.c
+++ b/test/103_gendata_h48/gendata_h48_tests.c
@@ -2,7 +2,7 @@
 
 #define MAXDEPTH 5
 #define COCSEPSIZE 1119792
-#define ETABLESIZE(h) (((3393 * 495 * 70) >> 1) << (h))
+#define ETABLESIZE(h) (((3393 * 495 * 70) >> 1) << (size_t)(h))
 
 size_t gendata_h48(void *, uint8_t, uint8_t);