21 files changed, 55 insertions, 54 deletions

diff --git a/test/001_pieces/pieces_tests.c b/test/001_pieces/pieces_tests.c
index f46a143..7937fb1 100644
--- a/test/001_pieces/pieces_tests.c
+++ b/test/001_pieces/pieces_tests.c
@@ -1,6 +1,6 @@
 #include "../test.h"
 
-void pieces(cube_t *, uint8_t [static 8], uint8_t [static 12]);
+void pieces(cube_t *, uint8_t [SIZE(8)], uint8_t [SIZE(12)]);
 
 void run(void) {
         int i;
diff --git a/test/010_math_permtoindex/permtoindex_tests.c b/test/010_math_permtoindex/permtoindex_tests.c
index f246ef3..2a7ecf3 100644
--- a/test/010_math_permtoindex/permtoindex_tests.c
+++ b/test/010_math_permtoindex/permtoindex_tests.c
@@ -1,6 +1,6 @@
 #include "../test.h"
 
-uint64_t permtoindex(size_t n, const uint8_t [n]);
+uint64_t permtoindex(size_t n, const uint8_t *);
 
 void run(void) {
         char str[STRLENMAX];
@@ -11,7 +11,7 @@ void run(void) {
         n = atoll(str);
         for (i = 0; i < n; i++) {
                 fgets(str, STRLENMAX, stdin);
-                a[i] = atoi(str);
+                a[i] = (uint8_t)atoi(str);
         }
 
         p = permtoindex(n, a);
diff --git a/test/011_math_indextoperm/indextoperm_tests.c b/test/011_math_indextoperm/indextoperm_tests.c
index e83cbad..1464d7b 100644
--- a/test/011_math_indextoperm/indextoperm_tests.c
+++ b/test/011_math_indextoperm/indextoperm_tests.c
@@ -1,6 +1,6 @@
 #include "../test.h"
 
-void indextoperm(uint64_t, size_t n, uint8_t [n]);
+void indextoperm(uint64_t, size_t n, uint8_t *);
 
 void run(void) {
         char str[STRLENMAX];
diff --git a/test/012_math_permsign/permsign_tests.c b/test/012_math_permsign/permsign_tests.c
index 5b4daa3..f5a52d0 100644
--- a/test/012_math_permsign/permsign_tests.c
+++ b/test/012_math_permsign/permsign_tests.c
@@ -1,6 +1,6 @@
 #include "../test.h"
 
-int permsign(size_t n, const uint8_t [n]);
+int permsign(size_t n, const uint8_t *);
 
 void run(void) {
         char str[STRLENMAX];
@@ -13,7 +13,7 @@ void run(void) {
 
         for (i = 0; i < n; i++) {
                 fgets(str, STRLENMAX, stdin);
-                a[i] = atoi(str);
+                a[i] = (uint8_t)atoi(str);
         }
 
         p = permsign(n, a);
diff --git a/test/013_math_digitstosumzero/digitstosumzero_tests.c b/test/013_math_digitstosumzero/digitstosumzero_tests.c
index 5c93083..8df1848 100644
--- a/test/013_math_digitstosumzero/digitstosumzero_tests.c
+++ b/test/013_math_digitstosumzero/digitstosumzero_tests.c
@@ -1,6 +1,6 @@
 #include "../test.h"
 
-uint64_t digitstosumzero(size_t n, uint8_t [n], uint8_t);
+uint64_t digitstosumzero(size_t n, uint8_t *, uint8_t);
 
 void run(void) {
         char str[STRLENMAX];
@@ -11,10 +11,10 @@ void run(void) {
         fgets(str, STRLENMAX, stdin);
         n = atoi(str);
         fgets(str, STRLENMAX, stdin);
-        b = atoi(str);
+        b = (uint8_t)atoi(str);
         for (i = 0; i < n; i++) {
                 fgets(str, STRLENMAX, stdin);
-                a[i] = atoi(str);
+                a[i] = (uint8_t)atoi(str);
         }
 
         p = digitstosumzero(n, a, b);
diff --git a/test/014_math_sumzerotodigits/sumzerotodigits.c b/test/014_math_sumzerotodigits/sumzerotodigits.c
index e8d2814..256ca5a 100644
--- a/test/014_math_sumzerotodigits/sumzerotodigits.c
+++ b/test/014_math_sumzerotodigits/sumzerotodigits.c
@@ -1,6 +1,6 @@
 #include "../test.h"
 
-void sumzerotodigits(uint64_t, size_t n, uint8_t, uint8_t [n]);
+void sumzerotodigits(uint64_t, size_t n, uint8_t, uint8_t *);
 
 void run(void) {
         char str[STRLENMAX];
@@ -8,9 +8,9 @@ void run(void) {
         uint64_t d;
 
         fgets(str, STRLENMAX, stdin);
-        n = atoi(str);
+        n = (uint8_t)atoi(str);
         fgets(str, STRLENMAX, stdin);
-        b = atoi(str);
+        b = (uint8_t)atoi(str);
         fgets(str, STRLENMAX, stdin);
         d = atoll(str);
 
diff --git a/test/033_inverse_move/inverse_move_tests.c b/test/033_inverse_move/inverse_move_tests.c
index 5453f83..86bf741 100644
--- a/test/033_inverse_move/inverse_move_tests.c
+++ b/test/033_inverse_move/inverse_move_tests.c
@@ -3,7 +3,7 @@
 extern char *movestr[];
 
 int64_t readmoves(const char *, size_t n, size_t m,
-    size_t *, size_t *, uint8_t [n], uint8_t [m]);
+    size_t *, size_t *, uint8_t *, uint8_t *);
 uint8_t inverse_move(uint8_t);
 
 void run(void) {
diff --git a/test/061_inverse_trans/inverse_trans_tests.c b/test/061_inverse_trans/inverse_trans_tests.c
index bad39fa..bb2a271 100644
--- a/test/061_inverse_trans/inverse_trans_tests.c
+++ b/test/061_inverse_trans/inverse_trans_tests.c
@@ -1,6 +1,6 @@
 #include "../test.h"
 
-uint8_t readtrans(char [static NISSY_SIZE_TRANSFORMATION]);
+uint8_t readtrans(char [SIZE(NISSY_SIZE_TRANSFORMATION)]);
 uint8_t inverse_trans(uint8_t);
 oriented_cube_t applymoves(oriented_cube_t, char *);
 oriented_cube_t applytrans(oriented_cube_t, char *);
diff --git a/test/062_transform_move/transform_move_tests.c b/test/062_transform_move/transform_move_tests.c
index 218c6a1..a9beb60 100644
--- a/test/062_transform_move/transform_move_tests.c
+++ b/test/062_transform_move/transform_move_tests.c
@@ -5,10 +5,10 @@
 cube_t applytrans(cube_t, const char *);
 uint8_t transform_move(uint8_t, uint8_t);
 int64_t readmoves(const char *, size_t n, size_t m,
-    size_t *, size_t *, uint8_t [n], uint8_t [m]);
+    size_t *, size_t *, uint8_t *, uint8_t *);
 oriented_cube_t move_extended(oriented_cube_t, uint8_t);
 oriented_cube_t applymoves(oriented_cube_t, const char *);
-uint8_t readtrans(const char[static NISSY_SIZE_TRANSFORMATION]);
+uint8_t readtrans(const char[SIZE(NISSY_SIZE_TRANSFORMATION)]);
 
 void run(void) {
         char movestr[STRLENMAX], transtr[STRLENMAX], cubestr[STRLENMAX];
diff --git a/test/075_set_eo/set_eo_tests.c b/test/075_set_eo/set_eo_tests.c
index a0ad3fe..0ce22e0 100644
--- a/test/075_set_eo/set_eo_tests.c
+++ b/test/075_set_eo/set_eo_tests.c
@@ -2,7 +2,7 @@
 
 uint64_t coord_eo(cube_t);
 void set_eo(cube_t *, uint64_t);
-void pieces(cube_t *, uint8_t [static 8], uint8_t [static 12]);
+void pieces(cube_t *, uint8_t [SIZE(8)], uint8_t [SIZE(12)]);
 
 void run(void) {
         char str[STRLENMAX];
diff --git a/test/076_copy_co/copy_co_tests.c b/test/076_copy_co/copy_co_tests.c
index 3ca109b..4127022 100644
--- a/test/076_copy_co/copy_co_tests.c
+++ b/test/076_copy_co/copy_co_tests.c
@@ -1,7 +1,7 @@
 #include "../test.h"
 
 void copy_co(cube_t *, cube_t);
-void pieces(cube_t *, uint8_t [static 8], uint8_t [static 12]);
+void pieces(cube_t *, uint8_t [SIZE(8)], uint8_t [SIZE(12)]);
 
 void run(void) {
         char str[STRLENMAX];
diff --git a/test/090_allowedmoves/allowedmoves_tests.c b/test/090_allowedmoves/allowedmoves_tests.c
index aa6bda7..cff8303 100644
--- a/test/090_allowedmoves/allowedmoves_tests.c
+++ b/test/090_allowedmoves/allowedmoves_tests.c
@@ -1,6 +1,6 @@
 #include "../test.h"
 
-bool allowedmoves(size_t n, const uint8_t [n]);
+bool allowedmoves(size_t n, const uint8_t *);
 
 static char *moves[] = {
         "U", "U2", "U'",
@@ -13,8 +13,8 @@ static char *moves[] = {
 
 void run(void) {
         char movestr[STRLENMAX];
-        uint8_t m[100];
-        int n, i, j;
+        uint8_t j, m[100];
+        int n, i;
 
         fgets(movestr, STRLENMAX, stdin);
         n = atoi(movestr);
diff --git a/test/114_cocsep_ttrep/cocsep_ttrep_tests.c b/test/114_cocsep_ttrep/cocsep_ttrep_tests.c
index c5c1bb5..936dac3 100644
--- a/test/114_cocsep_ttrep/cocsep_ttrep_tests.c
+++ b/test/114_cocsep_ttrep/cocsep_ttrep_tests.c
@@ -6,9 +6,9 @@ uint64_t coord_cocsep(cube_t);
 size_t gendata_cocsep(unsigned char *, uint64_t *, cube_t *);
 
 void run(void) {
-        uint8_t t;
+        uint8_t t, tt;
         unsigned char buf[2000000];
-        uint32_t *cocsepdata, tt;
+        uint32_t *cocsepdata;
         uint64_t i, selfsim[COCSEP_CLASSES];
         uint64_t j, k, l;
         cube_t rep[COCSEP_CLASSES], c, d;
diff --git a/test/115_gendata_eoesep/gendata_eoesep_tests.c b/test/115_gendata_eoesep/gendata_eoesep_tests.c
index 7ed9778..76de323 100644
--- a/test/115_gendata_eoesep/gendata_eoesep_tests.c
+++ b/test/115_gendata_eoesep/gendata_eoesep_tests.c
@@ -25,7 +25,7 @@ The test does not generate the full table. For reference, these are the values:
 
 unsigned char buf[FULLSIZE];
 
-size_t gendata_eoesep(unsigned char [static FULLSIZE], uint8_t);
+size_t gendata_eoesep(unsigned char [SIZE(FULLSIZE)], uint8_t);
 int64_t readtableinfo(size_t, const unsigned char *, tableinfo_t *);
 
 void run(void) {
diff --git a/test/121_h48map/h48map_tests.c b/test/121_h48map/h48map_tests.c
index 927b157..e06c395 100644
--- a/test/121_h48map/h48map_tests.c
+++ b/test/121_h48map/h48map_tests.c
@@ -2,11 +2,11 @@
 
 #define MAXPOS 1000
 
-void h48map_create(h48map_t [static 1], uint64_t, uint64_t);
-void h48map_destroy(h48map_t [static 1]);
-void h48map_insertmin(h48map_t [static 1], uint64_t, uint64_t);
-uint64_t h48map_value(h48map_t [static 1], uint64_t);
-kvpair_t h48map_nextkvpair(h48map_t [static 1], uint64_t [static 1]);
+void h48map_create(h48map_t [NON_NULL], uint64_t, uint64_t);
+void h48map_destroy(h48map_t [NON_NULL]);
+void h48map_insertmin(h48map_t [NON_NULL], uint64_t, uint64_t);
+uint64_t h48map_value(h48map_t [NON_NULL], uint64_t);
+kvpair_t h48map_nextkvpair(h48map_t [NON_NULL], uint64_t [NON_NULL]);
 
 char str[STRLENMAX];
 
diff --git a/test/122_gendata_h48short/gendata_h48short_tests.c b/test/122_gendata_h48short/gendata_h48short_tests.c
index 0de9408..0996f8c 100644
--- a/test/122_gendata_h48short/gendata_h48short_tests.c
+++ b/test/122_gendata_h48short/gendata_h48short_tests.c
@@ -2,11 +2,11 @@
 
 #define MAXPOS 200
 
-void h48map_create(h48map_t [static 1], uint64_t, uint64_t);
-void h48map_destroy(h48map_t [static 1]);
-kvpair_t h48map_nextkvpair(h48map_t [static 1], uint64_t [static 1]);
+void h48map_create(h48map_t [NON_NULL], uint64_t, uint64_t);
+void h48map_destroy(h48map_t [NON_NULL]);
+kvpair_t h48map_nextkvpair(h48map_t [NON_NULL], uint64_t [NON_NULL]);
 size_t gendata_cocsep(unsigned char *, uint64_t *, cube_t *);
-uint64_t gendata_h48short(gendata_h48short_arg_t [static 1]);
+uint64_t gendata_h48short(gendata_h48short_arg_t [NON_NULL]);
 
 char str[STRLENMAX];
 
@@ -34,7 +34,7 @@ void run(void) {
 
         capacity = readl();
         randomizer = readl();
-        arg.maxdepth = readl();
+        arg.maxdepth = (uint8_t)readl();
         arg.crep = crep;
         arg.selfsim = selfsim;
         arg.map = &map;
diff --git a/test/131_coorddata_dr/coorddata_dr.c b/test/131_coorddata_dr/coorddata_dr.c
index d8ac94a..d262fe3 100644
--- a/test/131_coorddata_dr/coorddata_dr.c
+++ b/test/131_coorddata_dr/coorddata_dr.c
@@ -11,7 +11,7 @@ size_t coordinate_dr_gendata(unsigned char *);
 
 void run(void) {
         bool found;
-        uint64_t t;
+        uint8_t t;
         char str[STRLENMAX];
         unsigned char *data;
         size_t size;
@@ -33,8 +33,8 @@ void run(void) {
                         goto cleanup;
                 }
 
-                for (t = 0, found = false; t < 48; t++) {
-                        if (!((UINT64_C(1) << t) & TGROUP))
+                for (t = 0, found = false, coord2 = UINT64_MAX; t < 48; t++) {
+                        if (!((UINT64_C(1) << (uint8_t)t) & TGROUP))
                                 continue;
 
                         coord2 = coordinate_dr_coord(transform(cube, t), data);
diff --git a/test/132_coorddata_dreo/coorddata_dreo.c b/test/132_coorddata_dreo/coorddata_dreo.c
index 2b99b7f..50294ff 100644
--- a/test/132_coorddata_dreo/coorddata_dreo.c
+++ b/test/132_coorddata_dreo/coorddata_dreo.c
@@ -11,7 +11,7 @@ size_t coordinate_dreo_gendata(unsigned char *);
 
 void run(void) {
         bool found;
-        uint64_t t;
+        uint8_t t;
         char str[STRLENMAX];
         unsigned char *data;
         size_t size;
@@ -33,8 +33,8 @@ void run(void) {
                         goto cleanup;
                 }
 
-                for (t = 0, found = false; t < 48; t++) {
-                        if (!((UINT64_C(1) << t) & TGROUP))
+                for (t = 0, found = false, coord2 = UINT64_MAX; t < 48; t++) {
+                        if (!((UINT64_C(1) << (uint64_t)t) & TGROUP))
                                 continue;
 
                         coord2 = coordinate_dreo_coord(transform(cube, t), data);
diff --git a/test/133_coordata_drfinnoe/coorddata_drfinnoe.c b/test/133_coordata_drfinnoe/coorddata_drfinnoe.c
index 11ae9f7..7d19361 100644
--- a/test/133_coordata_drfinnoe/coorddata_drfinnoe.c
+++ b/test/133_coordata_drfinnoe/coorddata_drfinnoe.c
@@ -10,7 +10,7 @@ size_t coordinate_drfinnoe_gendata(unsigned char *);
 
 void run(void) {
         bool found;
-        uint64_t t;
+        uint8_t t;
         char str[STRLENMAX];
         unsigned char *data;
         size_t size;
@@ -32,8 +32,8 @@ void run(void) {
                         goto cleanup;
                 }
 
-                for (t = 0, found = false; t < 48; t++) {
-                        if (!((UINT64_C(1) << t) & TGROUP))
+                for (t = 0, found = false, coord2 = UINT64_MAX; t < 48; t++) {
+                        if (!((UINT64_C(1) << (uint64_t)t) & TGROUP))
                                 continue;
 
                         coord2 = coordinate_drfinnoe_coord(transform(cube, t), data);
diff --git a/test/140_appendsolution/appendsolution_tests.c b/test/140_appendsolution/appendsolution_tests.c
index f9620ab..3f4fb15 100644
--- a/test/140_appendsolution/appendsolution_tests.c
+++ b/test/140_appendsolution/appendsolution_tests.c
@@ -16,12 +16,12 @@ See below for the output format.
 
 uint8_t readtrans(const char [NISSY_SIZE_TRANSFORMATION]);
 int64_t readmoves(const char *, size_t n, size_t m,
-    size_t *, size_t *, uint8_t [n], uint8_t [m]);
-void solution_moves_reset(solution_moves_t [static 1]);
-bool solution_list_init(solution_list_t [static 1], size_t n, char [n]);
-int64_t appendsolution(const solution_moves_t [static 1],
-    size_t, const uint64_t *, const solution_settings_t [static 1],
-    solution_list_t [static 1]);
+    size_t *, size_t *, uint8_t *, uint8_t *);
+void solution_moves_reset(solution_moves_t [NON_NULL]);
+bool solution_list_init(solution_list_t [NON_NULL], size_t n, char *);
+int64_t appendsolution(const solution_moves_t [NON_NULL],
+    size_t, const uint64_t *, const solution_settings_t [NON_NULL],
+    solution_list_t [NON_NULL]);
 
 void run(void) {
         int i, j, nnt, ntrans;
@@ -39,7 +39,7 @@ void run(void) {
                 .unniss = false,
                 .maxmoves = 20,
                 .maxsolutions = 100,
-                .optimal = -1,
+                .optimal = 0,
         };
 
         fgets(str, STRLENMAX, stdin);
@@ -48,8 +48,8 @@ void run(void) {
                 printf("Test error reading moves\n");
                 return;
         }
-        moves.nmoves = nm;
-        moves.npremoves = np;
+        moves.nmoves = (uint8_t)nm;
+        moves.npremoves = (uint8_t)np;
         fgets(str, STRLENMAX, stdin);
         settings.unniss = (bool)atoi(str);
 
@@ -64,7 +64,7 @@ void run(void) {
                 }
         }
         fgets(str, STRLENMAX, stdin);
-        settings.orientation = atoi(str);
+        settings.orientation = (uint8_t)atoi(str);
 
         appendsolution(&moves, nnt, tmask, &settings, &list);
 
diff --git a/test/test.h b/test/test.h
index 60e340f..b8c5922 100644
--- a/test/test.h
+++ b/test/test.h
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "../src/utils/compilers.h"
 #include "../src/utils/wrapthread.h"
 #include "../src/nissy.h"
 #include "../src/arch/arch.h"
@@ -27,7 +28,7 @@ bool isconsistent(oriented_cube_t);
 bool issolvable(oriented_cube_t);
 bool issolved(oriented_cube_t);
 oriented_cube_t readcube(char *);
-int64_t writecube(oriented_cube_t, size_t n, char [n]);
+int64_t writecube(oriented_cube_t, size_t n, char *);
 
 /* Test function to be implemented by all tests */
 void run(void);