1 files changed, 16 insertions, 16 deletions

diff --git a/src/solvers/coord/multisolve.h b/src/solvers/coord/multisolve.h
index a45bd6a..efd287d 100644
--- a/src/solvers/coord/multisolve.h
+++ b/src/solvers/coord/multisolve.h
@@ -16,20 +16,20 @@ typedef struct {
         const unsigned char *ptable[MAX_MULTICOORD_NCOORDS];
 } dfsarg_solve_multicoord_t;
 
-STATIC int64_t solve_multicoord(oriented_cube_t, multicoord_t [static 1],
+STATIC int64_t solve_multicoord(oriented_cube_t, multicoord_t [NON_NULL],
     uint8_t, uint8_t, uint8_t, uint64_t, uint8_t, uint8_t, uint64_t,
     const unsigned char *, size_t, char *, int (*)(void *), void *);
 STATIC long long solve_multicoord_dispatch(oriented_cube_t, const char *,
     unsigned, unsigned, unsigned, unsigned, unsigned, unsigned,
     unsigned long long, const unsigned char *, unsigned, char *,
-    long long [static NISSY_SIZE_SOLVE_STATS], int (*)(void *), void *);
+    long long [SIZE(NISSY_SIZE_SOLVE_STATS)], int (*)(void *), void *);
 STATIC bool multicoord_solution_admissible(
-    const dfsarg_solve_multicoord_t [static 1]);
-STATIC bool multicoord_dfs_stop(const dfsarg_solve_multicoord_t [static 1]);
-STATIC int64_t solve_multicoord_dfs(dfsarg_solve_multicoord_t [static 1]);
+    const dfsarg_solve_multicoord_t [NON_NULL]);
+STATIC bool multicoord_dfs_stop(const dfsarg_solve_multicoord_t [NON_NULL]);
+STATIC int64_t solve_multicoord_dfs(dfsarg_solve_multicoord_t [NON_NULL]);
 
 STATIC bool
-multicoord_solution_admissible(const dfsarg_solve_multicoord_t arg[static 1])
+multicoord_solution_admissible(const dfsarg_solve_multicoord_t arg[NON_NULL])
 {
         uint8_t n, i;
         const coord_t *c;
@@ -49,7 +49,7 @@ multicoord_solution_admissible(const dfsarg_solve_multicoord_t arg[static 1])
 }
 
 STATIC bool
-multicoord_dfs_stop(const dfsarg_solve_multicoord_t arg[static 1])
+multicoord_dfs_stop(const dfsarg_solve_multicoord_t arg[NON_NULL])
 {
         uint8_t pval, i;
         uint64_t cval;
@@ -69,11 +69,10 @@ multicoord_dfs_stop(const dfsarg_solve_multicoord_t arg[static 1])
 }
 
 STATIC int64_t
-solve_multicoord_dfs(dfsarg_solve_multicoord_t arg[static 1])
+solve_multicoord_dfs(dfsarg_solve_multicoord_t arg[NON_NULL])
 {
         uint8_t m, l, i;
-        uint32_t mm;
-        uint64_t coord;
+        uint64_t mm, coord;
         int64_t n, ret;
         const coord_t *c;
         cube_t backup_cube, backup_inverse;
@@ -108,7 +107,7 @@ solve_multicoord_dfs_notsolved:
         arg->solution_moves->nmoves++;
 
         for (m = 0; m < NMOVES; m++) {
-                if (!(mm & (UINT32_C(1) << (uint32_t)m)))
+                if (!(mm & (UINT64_C(1) << (uint64_t)m)))
                         continue;
 
                 arg->solution_moves->moves[l] = m;
@@ -141,7 +140,7 @@ solve_multicoord_dispatch(
         const unsigned char *data,
         unsigned solutions_size,
         char *sols,
-        long long stats[static NISSY_SIZE_SOLVE_STATS],
+        long long stats[SIZE(NISSY_SIZE_SOLVE_STATS)],
         int (*poll_status)(void *),
         void *poll_status_data
 )
@@ -163,15 +162,16 @@ solve_multicoord_dispatch(
                 return NISSY_ERROR_INVALID_SOLVER;
         }
 
-        return solve_multicoord(oc, mcoord, trans, minmoves,
-            maxmoves, maxsolutions, optimal, threads, data_size, data,
-            solutions_size, sols, poll_status, poll_status_data);
+        return solve_multicoord(oc, mcoord, trans, (uint8_t)minmoves,
+            (uint8_t)maxmoves, (uint8_t)maxsolutions, (uint8_t)optimal,
+                (uint8_t)threads, data_size, data, solutions_size, sols,
+                poll_status, poll_status_data);
 }
 
 STATIC int64_t
 solve_multicoord(
         oriented_cube_t oc,
-        multicoord_t mcoord [static 1],
+        multicoord_t mcoord [NON_NULL],
         uint8_t trans,
         uint8_t minmoves,
         uint8_t maxmoves,