2 files changed, 22 insertions, 22 deletions

diff --git a/src/cube.h b/src/cube.h
index 0eedfec..fb96823 100644
--- a/src/cube.h
+++ b/src/cube.h
@@ -4,47 +4,47 @@ number in case of error, unless otherwise specified. See (TODO:
 documentation) for details.
 */
 
-int nissy_compose(
+int64_t nissy_compose(
         const char cube[static 22],
         const char permutation[static 22],
         char result[static 22]
 );
 
-int nissy_inverse(
+int64_t nissy_inverse(
         const char cube[static 22],
         char result[static 22]
 );
 
-int nissy_applyoves(
+int64_t nissy_applymoves(
         const char cube[static 22],
         const char *moves,
         char result[static 22]
 );
 
-int nissy_applytrans(
+int64_t nissy_applytrans(
         const char cube[static 22],
         const char *transformation,
         char result[static 22]
 );
 
-int nissy_frommoves(
+int64_t nissy_frommoves(
         const char *moves,
         char result[static 22]
 );
 
-int nissy_readcube(
+int64_t nissy_readcube(
         const char *format,
         const char *cube_string,
         char result[static 22]
 );
 
-int nissy_writecube(
+int64_t nissy_writecube(
         const char *format,
         const char cube[static 22],
         char *result
 );
 
-int nissy_convertcube(
+int64_t nissy_convertcube(
         const char *format_in,
         const char *format_out,
         const char *cube_string,
@@ -58,13 +58,13 @@ slightly larger than the actual table size.
 */
 int64_t nissy_datasize(
         const char *solver,
-        const char *options
+        const char *options /* TODO: remove options, use only solver name */
 );
 
 /* Returns the number of bytes written, or -1 in case of error */
 int64_t nissy_gendata(
         const char *solver,
-        const char *options,
+        const char *options, /* TODO: remove options, use only solver name */
         void *generated_data
 );
 
@@ -72,8 +72,8 @@ int64_t nissy_gendata(
 int64_t nissy_solve(
         const char cube[static 22],
         const char *solver, 
-        const char *options,
-        const char *nisstype,
+        const char *options, /* TODO: remove options, use only solver name */
+        const char *nisstype, /* TODO: remove, use flags */
         int8_t minmoves,
         int8_t maxmoves,
         int64_t maxsolutions,
diff --git a/src/cube_public.h b/src/cube_public.h
index 01b6dac..65d5d54 100644
--- a/src/cube_public.h
+++ b/src/cube_public.h
@@ -1,8 +1,8 @@
 #include "cube.h"
 
-int write_result(cube_t, char [static 22]);
+_static int64_t write_result(cube_t, char [static 22]);
 
-int
+_static int64_t
 write_result(cube_t cube, char result[static 22])
 {
         if (!isconsistent(cube)) {
@@ -15,7 +15,7 @@ write_result(cube_t cube, char result[static 22])
         return issolvable(cube) ? 0 : 1;
 }
 
-int
+int64_t
 nissy_compose(
         const char cube[static 22],
         const char permutation[static 22],
@@ -31,7 +31,7 @@ nissy_compose(
         return write_result(res, result);
 }
 
-int
+int64_t
 nissy_inverse(
         const char cube[static 22],
         char result[static 22]
@@ -45,7 +45,7 @@ nissy_inverse(
         return write_result(res, result);
 }
 
-int
+int64_t
 nissy_applymoves(
         const char cube[static 22],
         const char *moves,
@@ -60,7 +60,7 @@ nissy_applymoves(
         return write_result(res, result);
 }
 
-int
+int64_t
 nissy_applytrans(
         const char cube[static 22],
         const char *transformation,
@@ -75,7 +75,7 @@ nissy_applytrans(
         return write_result(res, result);
 }
 
-int
+int64_t
 nissy_frommoves(
         const char *moves,
         char result[static 22]
@@ -88,7 +88,7 @@ nissy_frommoves(
         return write_result(res, result);
 }
 
-int
+int64_t
 nissy_readcube(
         const char *format,
         const char *cube_string,
@@ -102,7 +102,7 @@ nissy_readcube(
         return write_result(res, result);
 }
 
-int
+int64_t
 nissy_convertcube(
         const char *format_in,
         const char *format_out,
@@ -118,7 +118,7 @@ nissy_convertcube(
         return isconsistent(c) ? 0 : 2;
 }
 
-int
+int64_t
 nissy_writecube(
         const char *format,
         const char cube[static 22],