Removed array-size constants for certain objects (steps, commands...)

7 files changed, 20 insertions, 65 deletions

diff --git a/src/commands.c b/src/commands.c
index b397878..03eded0 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -150,7 +150,7 @@ version_cmd = {
         .exec        = version_exec,
 };
 
-Command *commands[NCOMMANDS] = {
+Command *commands[] = {
         &commands_cmd,
         &gen_cmd,
         &help_cmd,
@@ -164,6 +164,7 @@ Command *commands[NCOMMANDS] = {
         &cleanup_cmd,
         &unniss_cmd,
         &version_cmd,
+        NULL
 };
 
 /* Other constants ***********************************************************/
@@ -336,9 +337,8 @@ help_parse_args(int c, char **v)
         CommandArgs *a = new_args();
 
         if (c == 1) {
-                for (i = 0; i < NCOMMANDS; i++)
-                        if (commands[i] != NULL &&
-                            !strcmp(v[0], commands[i]->name))
+                for (i = 0; commands[i] != NULL; i++)
+                        if (!strcmp(v[0], commands[i]->name))
                                 a->command = commands[i];
                 if (a->command == NULL)
                         fprintf(stderr, "%s: command not found\n", v[0]);
@@ -473,7 +473,7 @@ gen_exec(CommandArgs *args)
         init_symcoord();
 
         fprintf(stderr, "Generating pruning tables...\n");
-        for (i = 0; i < NPTABLES && allpd[i] != NULL; i++)
+        for (i = 0; allpd[i] != NULL; i++)
                 genptable(allpd[i], args->opts->nthreads);
 
         fprintf(stderr, "Done!\n");
@@ -495,7 +495,7 @@ steps_exec(CommandArgs *args)
 {
         int i;
 
-        for (i = 0; i < NSTEPS && steps[i] != NULL; i++)
+        for (i = 0; steps[i] != NULL; i++)
                 printf("%-15s %s\n", steps[i]->shortname, steps[i]->name);
 }
 
@@ -504,7 +504,7 @@ commands_exec(CommandArgs *args)
 {
         int i;
 
-        for (i = 0; i < NCOMMANDS && commands[i] != NULL; i++)
+        for (i = 0; commands[i] != NULL; i++)
                 printf("%s\n", commands[i]->usage);
 
 }
@@ -642,8 +642,8 @@ read_step(CommandArgs *args, char *str)
 {
         int i;
 
-        for (i = 0; i < NSTEPS; i++) {
-                if (steps[i] != NULL && !strcmp(steps[i]->shortname, str)) {
+        for (i = 0; steps[i] != NULL; i++) {
+                if (!strcmp(steps[i]->shortname, str)) {
                         args->step = steps[i];
                         return true;
                 }
diff --git a/src/commands.h b/src/commands.h
index bac71f1..b7a4c36 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -6,11 +6,9 @@
 #include "solve.h"
 #include "steps.h"
 
-#define NCOMMANDS       20
-
 void                    free_args(CommandArgs *args);
 CommandArgs *           new_args();
 
-extern Command *        commands[NCOMMANDS];
+extern Command *        commands[];
 
 #endif
diff --git a/src/pruning.c b/src/pruning.c
index e6fd791..51bea10 100644
--- a/src/pruning.c
+++ b/src/pruning.c
@@ -98,7 +98,7 @@ pd_nxopt31_HTM = {
         .fbmod    = BINOM8ON4,
 };
 
-PruneData * allpd[NPTABLES] = {
+PruneData * allpd[] = {
         &pd_eofb_HTM,
         &pd_coud_HTM,
         &pd_cornershtr_HTM,
@@ -110,6 +110,7 @@ PruneData * allpd[NPTABLES] = {
         &pd_htrfin_htr,
 /*      &pd_khuge_HTM,*/
         &pd_nxopt31_HTM,
+        NULL
 };
 
 /* Functions *****************************************************************/
diff --git a/src/pruning.h b/src/pruning.h
index 0f20384..7da1e3e 100644
--- a/src/pruning.h
+++ b/src/pruning.h
@@ -3,8 +3,6 @@
 
 #include "symcoord.h"
 
-#define NPTABLES 20
-
 extern PruneData        pd_eofb_HTM;
 extern PruneData        pd_coud_HTM;
 extern PruneData        pd_corners_HTM;
@@ -17,7 +15,7 @@ extern PruneData        pd_htrfin_htr;
 extern PruneData        pd_khuge_HTM;
 extern PruneData        pd_nxopt31_HTM;
 
-extern PruneData *      allpd[NPTABLES];
+extern PruneData *      allpd[];
 
 void        genptable(PruneData *pd, int nthreads);
 void        print_ptable(PruneData *pd);
diff --git a/src/shell.c b/src/shell.c
index 2cb3719..6e67e0a 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -37,8 +37,8 @@ exec_args(int c, char **v)
         CommandArgs *args;
         Alg *scramble;
 
-        for (i = 0; i < NCOMMANDS; i++)
-                if (commands[i] != NULL && !strcmp(v[0], commands[i]->name))
+        for (i = 0; commands[i] != NULL; i++)
+                if (!strcmp(v[0], commands[i]->name))
                         cmd = commands[i];
 
         if (cmd == NULL) {
diff --git a/src/steps.c b/src/steps.c
index 5de3206..83d105c 100644
--- a/src/steps.c
+++ b/src/steps.c
@@ -929,7 +929,7 @@ htrfin_htr = {
         .ntables   = 1,
 };
 
-Step *steps[NSTEPS] = {
+Step *steps[] = {
         &optimal_HTM, /* first is default */
         &optimal_light_HTM,
 
@@ -985,6 +985,8 @@ Step *steps[NSTEPS] = {
         &cornershtr_URF,
         &corners_HTM,
         &corners_URF,
+
+        NULL
 };
 
 /* Checkers, estimators and validators ***************************************/
diff --git a/src/steps.h b/src/steps.h
index 53f8e1b..da5c041 100644
--- a/src/steps.h
+++ b/src/steps.h
@@ -3,55 +3,11 @@
 
 #include "pruning.h"
 
-#define NSTEPS          50
+extern Step *           steps[];
 
-extern Step *           steps[NSTEPS];
-
-extern Step             optimal_HTM;
-extern Step             optimal_light_HTM;
-extern Step             eofin_eo;
-extern Step             eofbfin_eofb;
-extern Step             eorlfin_eorl;
-extern Step             eoudfin_eoud;
-extern Step             eoany_HTM;
-extern Step             eofb_HTM;
-extern Step             eorl_HTM;
-extern Step             eoud_HTM;
-extern Step             coany_HTM;
-extern Step             coud_HTM;
-extern Step             corl_HTM;
-extern Step             cofb_HTM;
-extern Step             coany_URF;
-extern Step             coud_URF;
-extern Step             corl_URF;
-extern Step             cofb_URF;
+/* Two steps used directly by two-phase solver */
 extern Step             drany_HTM;
-extern Step             drud_HTM;
-extern Step             drrl_HTM;
-extern Step             drfb_HTM;
-extern Step             dr_eo;
-extern Step             dr_eofb;
-extern Step             dr_eorl;
-extern Step             dr_eoud;
-extern Step             drud_eofb;
-extern Step             drrl_eofb;
-extern Step             drud_eorl;
-extern Step             drfb_eorl;
-extern Step             drfb_eoud;
-extern Step             drrl_eoud;
 extern Step             dranyfin_DR;
-extern Step             drudfin_drud;
-extern Step             drrlfin_drrl;
-extern Step             drfbfin_drfb;
-extern Step             htr_any;
-extern Step             htr_drud;
-extern Step             htr_drrl;
-extern Step             htr_drfb;
-extern Step             htrfin_htr;
-extern Step             cornershtr_HTM;
-extern Step             cornershtr_URF;
-extern Step             corners_HTM;
-extern Step             corners_URF;
 
 void                    copy_estimatedata(EstimateData *s, EstimateData *d);
 void                    invert_estimatedata(EstimateData *ed);