7 files changed, 30 insertions, 24 deletions

diff --git a/tools/000_gendata/gendata.c b/tools/000_gendata/gendata.c
index 213852f..51c2f47 100644
--- a/tools/000_gendata/gendata.c
+++ b/tools/000_gendata/gendata.c
@@ -8,9 +8,9 @@ static void
 run(void) {
         int64_t size;
         bool consistent, expected;
-        char *buf, filename[1024];
+        char *buf, filename[1024], dataid[NISSY_DATAID_SIZE];
         
-        size = generatetable(solver, &buf);
+        size = generatetable(solver, &buf, dataid);
         switch (size) {
         case -1:
                 return;
@@ -23,7 +23,7 @@ run(void) {
                 if (consistent && expected) {
                         printf("\n");
                         printf("Generated %" PRId64 " bytes.\n", size);
-                        sprintf(filename, "tables/%s", solver);
+                        sprintf(filename, "tables/%s", dataid);
                         writetable(buf, size, filename);
                 }
                 if (!consistent)
diff --git a/tools/100_checkdata/checkdata.c b/tools/100_checkdata/checkdata.c
index fe94427..8bc308c 100644
--- a/tools/100_checkdata/checkdata.c
+++ b/tools/100_checkdata/checkdata.c
@@ -6,13 +6,13 @@ char *solver, *filename;
 static void
 run(void) {
         long long int size, result;
-        char *buf;
+        char *buf, dataid[NISSY_DATAID_SIZE];
         FILE *f;
         
-        size = nissy_datasize(solver);
+        size = nissy_solverinfo(solver, dataid);
 
         if (size <= 0) {
-                printf("Error in datasize\n");
+                printf("Error in solverinfo\n");
                 return;
         }
 
diff --git a/tools/300_solve_small/solve_small.c b/tools/300_solve_small/solve_small.c
index 073de89..6a1f7b5 100644
--- a/tools/300_solve_small/solve_small.c
+++ b/tools/300_solve_small/solve_small.c
@@ -46,7 +46,7 @@ void run(void) {
 }
 
 int main(int argc, char **argv) {
-        char filename[255];
+        char filename[255], dataid[NISSY_DATAID_SIZE];
 
         if (argc < 2) {
                 printf("Error: not enough arguments. "
@@ -63,7 +63,7 @@ int main(int argc, char **argv) {
         if (getdata(solver, &buf, filename) != 0)
                 return 1;
 
-        size = nissy_datasize(solver);
+        size = nissy_solverinfo(solver, dataid);
 
         timerun(run);
 
diff --git a/tools/301_solve_file/solve_file.c b/tools/301_solve_file/solve_file.c
index fe41bb7..cefc608 100644
--- a/tools/301_solve_file/solve_file.c
+++ b/tools/301_solve_file/solve_file.c
@@ -33,7 +33,7 @@ void run(void) {
 }
 
 int main(int argc, char **argv) {
-        char filename[255], *scrfilename;
+        char filename[255], dataid[NISSY_DATAID_SIZE], *scrfilename;
         FILE *scrfile;
 
         if (argc < 3) {
@@ -52,7 +52,7 @@ int main(int argc, char **argv) {
         if (getdata(solver, &buf, filename) != 0)
                 return 1;
 
-        size = nissy_datasize(solver);
+        size = nissy_solverinfo(solver, dataid);
 
         if ((scrfile = fopen(scrfilename, "r")) == NULL) {
                 printf("Error: could not read given file '%s'.\n",
diff --git a/tools/302_solve_multisol/solve_multisol.c b/tools/302_solve_multisol/solve_multisol.c
index a03c2a0..c6ab685 100644
--- a/tools/302_solve_multisol/solve_multisol.c
+++ b/tools/302_solve_multisol/solve_multisol.c
@@ -39,7 +39,7 @@ void run(void) {
 }
 
 int main(int argc, char **argv) {
-        char filename[255];
+        char filename[255], dataid[NISSY_DATAID_SIZE];
 
         if (argc < 3) {
                 printf("Error: not enough arguments. "
@@ -57,7 +57,7 @@ int main(int argc, char **argv) {
         if (getdata(solver, &buf, filename) != 0)
                 return 1;
 
-        size = nissy_datasize(solver);
+        size = nissy_solverinfo(solver, dataid);
 
         timerun(run);
 
diff --git a/tools/400_solvetest/solve_test.c b/tools/400_solvetest/solve_test.c
index 9b6c094..a98be26 100644
--- a/tools/400_solvetest/solve_test.c
+++ b/tools/400_solvetest/solve_test.c
@@ -94,7 +94,7 @@ void run(void) {
 }
 
 int main(int argc, char **argv) {
-        char filename[255];
+        char filename[255], dataid[NISSY_DATAID_SIZE];
 
         if (argc < 2) {
                 printf("Error: not enough arguments. "
@@ -110,7 +110,7 @@ int main(int argc, char **argv) {
         if (getdata(solver, &buf, filename) != 0)
                 return 1;
 
-        size = nissy_datasize(solver);
+        size = nissy_solverinfo(solver, dataid);
 
         timerun(run);
 
diff --git a/tools/tool.h b/tools/tool.h
index 3488f34..b65f33a 100644
--- a/tools/tool.h
+++ b/tools/tool.h
@@ -13,7 +13,8 @@ static void log_stderr(const char *, ...);
 static void log_stdout(const char *, ...);
 static double timerun(void (*)(void));
 static void writetable(const char *, int64_t, const char *);
-static long long int generatetable(const char *, char **);
+static long long int generatetable(const char *, char **,
+    char [static NISSY_DATAID_SIZE]);
 static long long int derivetable(
     const char *, const char *, const char *, char **);
 static int getdata(const char *, char **, const char *);
@@ -86,11 +87,15 @@ writetable(const char *buf, int64_t size, const char *filename)
 }
 
 static long long int
-generatetable(const char *solver, char **buf)
+generatetable(
+        const char *solver,
+        char **buf,
+        char dataid[static NISSY_DATAID_SIZE]
+)
 {
         long long int size, gensize;
 
-        size = nissy_datasize(solver);
+        size = nissy_solverinfo(solver, dataid);
         if (size < 0) {
                 printf("Error getting table size.\n");
                 return -1;
@@ -120,7 +125,7 @@ derivetable(
 {
         uint8_t h, k;
         long long int size, gensize;
-        char *fulltable;
+        char *fulltable, dataid[NISSY_DATAID_SIZE];
 
         if (getdata(solver_large, &fulltable, filename_large) != 0) {
                 printf("Error reading full table.\n");
@@ -128,7 +133,7 @@ derivetable(
                 goto derivetable_error_nofree;
         }
 
-        size = nissy_datasize(solver_small);
+        size = nissy_solverinfo(solver_small, dataid);
         if (size == -1) {
                 printf("Error getting table size.\n");
                 gensize = -2;
@@ -164,10 +169,11 @@ getdata(
 ) {
         long long int size, sizeread;
         FILE *f;
+        char dataid[NISSY_DATAID_SIZE];
 
         if ((f = fopen(filename, "rb")) == NULL) {
                 printf("Table file not found, generating it.\n");
-                size = generatetable(solver, buf);
+                size = generatetable(solver, buf, dataid);
                 switch (size) {
                 case -1:
                         goto getdata_error_nofree;
@@ -179,7 +185,7 @@ getdata(
                 }
         } else {
                 printf("Reading tables from file %s\n", filename);
-                size = nissy_datasize(solver);
+                size = nissy_solverinfo(solver, dataid);
                 *buf = malloc(size);
                 sizeread = fread(*buf, size, 1, f);
                 fclose(f);
@@ -203,10 +209,10 @@ gendata_run(
         uint64_t expected[static 21]
 ) {
         long long int size;
-        char *buf, filename[1024];
+        char *buf, filename[1024], dataid[NISSY_DATAID_SIZE];
 
-        sprintf(filename, "tables/%s", solver);
-        size = generatetable(solver, &buf);
+        size = generatetable(solver, &buf, dataid);
+        sprintf(filename, "tables/%s", dataid);
         switch (size) {
         case -1:
                 return;