From e6be287bbfa6beda038ec8b085300c5dc9c2ecd8 Mon Sep 17 00:00:00 2001 From: Sebastiano Tronto Date: Sat, 4 Apr 2026 12:02:56 +0200 Subject: Use macro for [static N] --- src/solvers/coord/common.h | 30 +++++++++++++++--------------- src/solvers/coord/gendata.h | 32 ++++++++++++++++---------------- src/solvers/coord/htr.h | 4 ++-- src/solvers/coord/multisolve.h | 20 ++++++++++---------- src/solvers/coord/solve.h | 24 ++++++++++++------------ src/solvers/coord/types_macros.h | 4 ++-- src/solvers/coord/utils.h | 4 ++-- 7 files changed, 59 insertions(+), 59 deletions(-) (limited to 'src/solvers/coord') diff --git a/src/solvers/coord/common.h b/src/solvers/coord/common.h index d154636..593641f 100644 --- a/src/solvers/coord/common.h +++ b/src/solvers/coord/common.h @@ -1,16 +1,16 @@ STATIC uint64_t coord_coord_generic( - const coord_t [static 1], cube_t, const unsigned char *); + const coord_t [NON_NULL], cube_t, const unsigned char *); STATIC cube_t coord_cube_generic( - const coord_t [static 1], uint64_t, const unsigned char *); + const coord_t [NON_NULL], uint64_t, const unsigned char *); STATIC bool coord_isnasty_generic( - const coord_t [static 1], uint64_t, const unsigned char *); -STATIC size_t coord_gendata_generic(const coord_t [static 1], unsigned char *); + const coord_t [NON_NULL], uint64_t, const unsigned char *); +STATIC size_t coord_gendata_generic(const coord_t [NON_NULL], unsigned char *); -STATIC bool solution_lastqt_cw(const solution_moves_t [static 1]); -STATIC bool coord_can_switch(const coord_t [static 1], const unsigned char *, +STATIC bool solution_lastqt_cw(const solution_moves_t [NON_NULL]); +STATIC bool coord_can_switch(const coord_t [NON_NULL], const unsigned char *, size_t, const uint8_t *); STATIC bool coord_is_solved( - const coord_t [static 1], uint64_t, const unsigned char *); + const coord_t [NON_NULL], uint64_t, const unsigned char *); STATIC cube_t coordinate_merge_ce(cube_t, cube_t); STATIC cube_t coordinate_merge_ec(cube_t, cube_t); @@ -18,7 +18,7 @@ STATIC cube_t coordinate_merge_cpco(cube_t, cube_t); STATIC uint64_t coord_coord_generic( - const coord_t coord[static 1], + const coord_t coord[NON_NULL], cube_t c, const unsigned char *data ) @@ -36,7 +36,7 @@ coord_coord_generic( STATIC cube_t coord_cube_generic( - const coord_t coord[static 1], + const coord_t coord[NON_NULL], uint64_t i, const unsigned char *data ) @@ -54,7 +54,7 @@ coord_cube_generic( STATIC bool coord_isnasty_generic( - const coord_t coord[static 1], + const coord_t coord[NON_NULL], uint64_t i, const unsigned char *data ) @@ -73,7 +73,7 @@ coord_isnasty_generic( STATIC size_t coord_gendata_generic( - const coord_t coord[static 1], + const coord_t coord[NON_NULL], unsigned char *data ) { @@ -144,21 +144,21 @@ coord_gendata_generic( } STATIC bool -solution_lastqt_cw(const solution_moves_t s[static 1]) +solution_lastqt_cw(const solution_moves_t s[NON_NULL]) { return are_lastmoves_singlecw(s->nmoves, s->moves) && are_lastmoves_singlecw(s->npremoves, s->premoves); } STATIC bool -solution_always_valid(const solution_moves_t s[static 1]) +solution_always_valid(const solution_moves_t s[NON_NULL]) { return true; } STATIC bool coord_can_switch( - const coord_t coord[static 1], + const coord_t coord[NON_NULL], const unsigned char *data, size_t n, const uint8_t *moves @@ -192,7 +192,7 @@ coord_can_switch( STATIC bool coord_is_solved( - const coord_t coord[static 1], + const coord_t coord[NON_NULL], uint64_t i, const unsigned char *data ) diff --git a/src/solvers/coord/gendata.h b/src/solvers/coord/gendata.h index cbc8774..f803044 100644 --- a/src/solvers/coord/gendata.h +++ b/src/solvers/coord/gendata.h @@ -1,21 +1,21 @@ -STATIC size_t gendata_coord(const coord_t [static 1], unsigned char *); +STATIC size_t gendata_coord(const coord_t [NON_NULL], unsigned char *); STATIC size_t gendata_multicoord( - const multicoord_t [static 1], unsigned char *); + const multicoord_t [NON_NULL], unsigned char *); STATIC long long gendata_coord_dispatch(const char *, unsigned long long, unsigned char *); STATIC tableinfo_t genptable_coord( - const coord_t [static 1], const unsigned char *, unsigned char *); + const coord_t [NON_NULL], const unsigned char *, unsigned char *); STATIC uint64_t genptable_coord_init_solved( - const coord_t [static 1], const unsigned char *, unsigned char *); + const coord_t [NON_NULL], const unsigned char *, unsigned char *); STATIC bool switch_to_fromnew(uint64_t, uint64_t, uint64_t); -STATIC uint64_t genptable_coord_fillneighbors(const coord_t [static 1], +STATIC uint64_t genptable_coord_fillneighbors(const coord_t [NON_NULL], const unsigned char *, uint64_t, uint8_t, unsigned char *); -STATIC uint64_t genptable_coord_fillfromnew(const coord_t [static 1], +STATIC uint64_t genptable_coord_fillfromnew(const coord_t [NON_NULL], const unsigned char *, uint64_t, uint8_t, unsigned char *); STATIC uint8_t get_coord_pval( - const coord_t [static 1], const unsigned char *, uint64_t); + const coord_t [NON_NULL], const unsigned char *, uint64_t); STATIC void set_coord_pval( - const coord_t [static 1], unsigned char *, uint64_t, uint8_t); + const coord_t [NON_NULL], unsigned char *, uint64_t, uint8_t); STATIC long long gendata_coord_dispatch( @@ -40,7 +40,7 @@ gendata_coord_dispatch( } STATIC size_t -gendata_coord(const coord_t coord[static 1], unsigned char *buf) +gendata_coord(const coord_t coord[NON_NULL], unsigned char *buf) { uint64_t coord_dsize, tablesize, ninfo; unsigned char *pruningbuf, *coord_data; @@ -96,7 +96,7 @@ gendata_coord_error: } STATIC size_t -gendata_multicoord(const multicoord_t mcoord[static 1], unsigned char *buf) +gendata_multicoord(const multicoord_t mcoord[NON_NULL], unsigned char *buf) { unsigned char *b; size_t i, s, ret; @@ -141,7 +141,7 @@ gendata_multicoord(const multicoord_t mcoord[static 1], unsigned char *buf) STATIC tableinfo_t genptable_coord( - const coord_t coord[static 1], + const coord_t coord[NON_NULL], const unsigned char *data, unsigned char *table ) @@ -204,7 +204,7 @@ genptable_coord( STATIC uint64_t genptable_coord_init_solved( - const coord_t coord[static 1], + const coord_t coord[NON_NULL], const unsigned char *coord_data, unsigned char *table ) @@ -238,7 +238,7 @@ switch_to_fromnew(uint64_t done, uint64_t max, uint64_t nm) STATIC uint64_t genptable_coord_fillneighbors( - const coord_t coord[static 1], + const coord_t coord[NON_NULL], const unsigned char *data, uint64_t i, uint8_t d, @@ -276,7 +276,7 @@ genptable_coord_fillneighbors( STATIC uint64_t genptable_coord_fillfromnew( - const coord_t coord[static 1], + const coord_t coord[NON_NULL], const unsigned char *data, uint64_t i, uint8_t d, @@ -331,7 +331,7 @@ genptable_coord_fillfromnew( STATIC uint8_t get_coord_pval( - const coord_t coord[static 1], + const coord_t coord[NON_NULL], const unsigned char *table, uint64_t i ) @@ -341,7 +341,7 @@ get_coord_pval( STATIC void set_coord_pval( - const coord_t coord[static 1], + const coord_t coord[NON_NULL], unsigned char *table, uint64_t i, uint8_t val diff --git a/src/solvers/coord/htr.h b/src/solvers/coord/htr.h index cfd451b..602625b 100644 --- a/src/solvers/coord/htr.h +++ b/src/solvers/coord/htr.h @@ -4,7 +4,7 @@ STATIC bool coordinate_htr_isnasty(uint64_t, const unsigned char *); STATIC size_t coordinate_htr_gendata(unsigned char *); STATIC bool htr_checkmoves(bool *, uint8_t, const uint8_t *); -STATIC bool htr_solution_prune(const solution_moves_t [static 1]); +STATIC bool htr_solution_prune(const solution_moves_t [NON_NULL]); STATIC bool is_cp_htr(uint64_t, const unsigned char *); STATIC coord_t coordinate_htr = { @@ -97,7 +97,7 @@ htr_checkmoves(bool *f, uint8_t n, const uint8_t *moves) } STATIC bool -htr_solution_prune(const solution_moves_t s[static 1]) +htr_solution_prune(const solution_moves_t s[NON_NULL]) { bool f; diff --git a/src/solvers/coord/multisolve.h b/src/solvers/coord/multisolve.h index a45bd6a..28f03bb 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,7 +69,7 @@ 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; @@ -141,7 +141,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 ) @@ -171,7 +171,7 @@ solve_multicoord_dispatch( 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, diff --git a/src/solvers/coord/solve.h b/src/solvers/coord/solve.h index 9ea6d1a..fcdb06e 100644 --- a/src/solvers/coord/solve.h +++ b/src/solvers/coord/solve.h @@ -13,20 +13,20 @@ typedef struct { const unsigned char *ptable; } dfsarg_solve_coord_t; -STATIC int64_t solve_coord(oriented_cube_t, coord_t [static 1], uint8_t, +STATIC int64_t solve_coord(oriented_cube_t, coord_t [NON_NULL], uint8_t, 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_coord_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 *); -STATIC bool coord_solution_admissible(const dfsarg_solve_coord_t [static 1]); -STATIC bool coord_continue_onnormal(const dfsarg_solve_coord_t [static 1]); -STATIC bool coord_continue_oninverse(const dfsarg_solve_coord_t [static 1]); -STATIC int64_t solve_coord_dfs(dfsarg_solve_coord_t [static 1]); + long long [SIZE(NISSY_SIZE_SOLVE_STATS)], int (*)(void *), void *); +STATIC bool coord_solution_admissible(const dfsarg_solve_coord_t [NON_NULL]); +STATIC bool coord_continue_onnormal(const dfsarg_solve_coord_t [NON_NULL]); +STATIC bool coord_continue_oninverse(const dfsarg_solve_coord_t [NON_NULL]); +STATIC int64_t solve_coord_dfs(dfsarg_solve_coord_t [NON_NULL]); STATIC bool -coord_solution_admissible(const dfsarg_solve_coord_t arg[static 1]) +coord_solution_admissible(const dfsarg_solve_coord_t arg[NON_NULL]) { uint8_t n; @@ -39,7 +39,7 @@ coord_solution_admissible(const dfsarg_solve_coord_t arg[static 1]) } STATIC bool -coord_continue_onnormal(const dfsarg_solve_coord_t arg[static 1]) +coord_continue_onnormal(const dfsarg_solve_coord_t arg[NON_NULL]) { uint8_t flag, nn, ni, swbound_n, swbound_i, pval; uint64_t coord; @@ -93,7 +93,7 @@ coord_continue_onnormal(const dfsarg_solve_coord_t arg[static 1]) } STATIC bool -coord_continue_oninverse(const dfsarg_solve_coord_t arg[static 1]) +coord_continue_oninverse(const dfsarg_solve_coord_t arg[NON_NULL]) { uint8_t flag, nn, ni, swbound_n, swbound_i, pval; uint64_t coord; @@ -147,7 +147,7 @@ coord_continue_oninverse(const dfsarg_solve_coord_t arg[static 1]) } STATIC int64_t -solve_coord_dfs(dfsarg_solve_coord_t arg[static 1]) +solve_coord_dfs(dfsarg_solve_coord_t arg[NON_NULL]) { bool lastbackup; uint8_t m, l, nnbackup, nibackup, nmoves; @@ -258,7 +258,7 @@ solve_coord_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 ) @@ -288,7 +288,7 @@ solve_coord_dispatch( STATIC int64_t solve_coord( oriented_cube_t oc, - coord_t coord [static 1], + coord_t coord [NON_NULL], uint8_t trans, uint8_t nissflag, uint8_t minmoves, diff --git a/src/solvers/coord/types_macros.h b/src/solvers/coord/types_macros.h index b75fab8..81db9d4 100644 --- a/src/solvers/coord/types_macros.h +++ b/src/solvers/coord/types_macros.h @@ -27,8 +27,8 @@ typedef struct { uint64_t moves_mask_gendata; uint64_t moves_mask_solve; uint64_t trans_mask; - bool (*is_admissible)(const solution_moves_t[static 1]); - bool (*solution_prune)(const solution_moves_t[static 1]); + bool (*is_admissible)(const solution_moves_t[NON_NULL]); + bool (*solution_prune)(const solution_moves_t[NON_NULL]); bool (*is_solvable)(cube_t); /* if is_solved is null, coord == 0 is used */ bool (*is_solved)(uint64_t, const unsigned char *); diff --git a/src/solvers/coord/utils.h b/src/solvers/coord/utils.h index c8a9338..0062587 100644 --- a/src/solvers/coord/utils.h +++ b/src/solvers/coord/utils.h @@ -2,7 +2,7 @@ STATIC coord_t *parse_coord(size_t, const char *); STATIC multicoord_t *parse_multicoord(size_t, const char *); STATIC void parse_coord_and_trans( const char *, coord_t **, multicoord_t **, uint8_t *); -STATIC long long dataid_coord(const char *, char [static NISSY_SIZE_DATAID]); +STATIC long long dataid_coord(const char *, char [SIZE(NISSY_SIZE_DATAID)]); STATIC coord_t * parse_coord(size_t n, const char *coord) @@ -60,7 +60,7 @@ parse_coord_and_trans( } STATIC long long -dataid_coord(const char *ca, char dataid[static NISSY_SIZE_DATAID]) +dataid_coord(const char *ca, char dataid[SIZE(NISSY_SIZE_DATAID)]) { coord_t *c; multicoord_t *mc; -- cgit v1.3