From bfb7b1ab9d2c85a256c42c006060ffe7c2652638 Mon Sep 17 00:00:00 2001 From: Sebastiano Tronto Date: Wed, 12 Mar 2025 16:40:07 +0100 Subject: Revert API change --- shell/shell.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'shell') diff --git a/shell/shell.c b/shell/shell.c index 2853350..2a1a8cd 100644 --- a/shell/shell.c +++ b/shell/shell.c @@ -17,7 +17,6 @@ #define FLAG_PERM "-perm" #define FLAG_COMMAND "-command" #define FLAG_STR_CUBE "-cubestr" -#define FLAG_SOLVE_OPTS "-options" #define FLAG_FORMAT "-format" #define FLAG_FORMAT_IN "-fin" #define FLAG_FORMAT_OUT "-fout" @@ -45,7 +44,6 @@ typedef struct { char cube_perm[22]; char *str_command; char *str_cube; - char *str_options; char *str_format; char *str_format_in; char *str_format_out; @@ -81,7 +79,6 @@ static bool set_cube(int, char **, args_t *); static bool set_cube_perm(int, char **, args_t *); static bool set_str_command(int, char **, args_t *); static bool set_str_cube(int, char **, args_t *); -static bool set_str_options(int, char **, args_t *); static bool set_str_format(int, char **, args_t *); static bool set_str_format_in(int, char **, args_t *); static bool set_str_format_out(int, char **, args_t *); @@ -108,7 +105,6 @@ struct { OPTION(FLAG_PERM, 1, set_cube_perm), OPTION(FLAG_COMMAND, 1, set_str_command), OPTION(FLAG_STR_CUBE, 1, set_str_cube), - OPTION(FLAG_SOLVE_OPTS, 1, set_str_options), OPTION(FLAG_FORMAT, 1, set_str_format), OPTION(FLAG_FORMAT_IN, 1, set_str_format_in), OPTION(FLAG_FORMAT_OUT, 1, set_str_format_out), @@ -201,7 +197,6 @@ struct { "solve", "solve " FLAG_SOLVER " SOLVER" "[" FLAG_MINMOVES " n] [" FLAG_MAXMOVES " N] " - "[" FLAG_SOLVE_OPTS " options] " FLAG_CUBE " CUBE" FLAG_THREADS " T", "Solve the given CUBE using SOLVER, " @@ -213,7 +208,6 @@ struct { "solve_scramble", "solve_scramble " FLAG_SOLVER " SOLVER" "[" FLAG_MINMOVES " n] [" FLAG_MAXMOVES " N] " - "[" FLAG_SOLVE_OPTS " options] " FLAG_MOVES " MOVES", "Solve the given SCRAMBLE using SOLVER, " "using at least n and at most N moves. " @@ -485,9 +479,9 @@ solve_exec(args_t *args) } ret = nissy_solve( - args->cube, args->str_solver, args->str_options, nissflag, - args->minmoves, args->maxmoves, args->maxsolutions, args->optimal, - args->threads, size, buf, SOLUTIONS_BUFFER_SIZE, solutions, stats); + args->cube, args->str_solver, nissflag, args->minmoves, + args->maxmoves, args->maxsolutions, args->optimal, args->threads, + size, buf, SOLUTIONS_BUFFER_SIZE, solutions, stats); free(buf); @@ -664,14 +658,6 @@ set_str_cube(int argc, char **argv, args_t *args) return true; } -static bool -set_str_options(int argc, char **argv, args_t *args) -{ - args->str_options = argv[0]; - - return true; -} - static bool set_str_format(int argc, char **argv, args_t *args) { -- cgit v1.3