Cleanup, update documentation, fix examples

1 files changed, 11 insertions, 27 deletions

diff --git a/src/solvers/h48/utils.h b/src/solvers/h48/utils.h
index 17f1c94..682eb1d 100644
--- a/src/solvers/h48/utils.h
+++ b/src/solvers/h48/utils.h
@@ -4,22 +4,21 @@
 #define H48_HMAX UINT8_C(7)
 #endif
 
-long long parse_h48_hk(
-    const char *, uint8_t [static 1], uint8_t [static 1]);
+long long parse_h48h(const char *, uint8_t [static 1]);
 STATIC long long dataid_h48(const char *, char [static NISSY_SIZE_DATAID]);
 
 long long
-parse_h48_hk(const char *buf, uint8_t h[static 1], uint8_t k[static 1])
+parse_h48h(const char *buf, uint8_t h[static 1])
 {
         char format_error_msg[100];
         sprintf(format_error_msg, "[H48] Error parsing H48 solver: must be in "
-            "'h48h*k*' format, but got '%s'\n", buf);
+            "'h48h*' format, but got '%s'\n", buf);
 
         buf += 3;
 
         if (*buf != 'h') {
                 LOG(format_error_msg);
-                goto parse_h48_hk_error;
+                goto parse_h48h_error;
         }
         buf++;
 
@@ -27,48 +26,33 @@ parse_h48_hk(const char *buf, uint8_t h[static 1], uint8_t k[static 1])
         if (*h > H48_HMAX) {
                 LOG("[H48] Invalid value %" PRIu8 " for parameter h (must be "
                      "at most %" PRIu8 ")\n", *h, H48_HMAX);
-                goto parse_h48_hk_error;
+                goto parse_h48h_error;
         }
 
         for ( ; *buf >= 0 + '0' && *buf <= 9 + '0'; buf++) {
                 if (*buf == 0) {
                         LOG(format_error_msg);
-                        goto parse_h48_hk_error;
+                        goto parse_h48h_error;
                 }
         }
 
-        if (*buf != 'k') {
-                LOG(format_error_msg);
-                goto parse_h48_hk_error;
-        }
-        buf++;
-
-        *k = atoi(buf);
-        if (!(*k == 2 || (*k == 4 && *h == 0))) {
-                LOG("[H48] Invalid combinations of values h=%" PRIu8 " and k=%"
-                    PRIu8 " for parameters h and k\n", *h, *k);
-                goto parse_h48_hk_error;
-        }
-
         return NISSY_OK;
 
-parse_h48_hk_error:
+parse_h48h_error:
         *h = 0;
-        *k = 0;
         return NISSY_ERROR_INVALID_SOLVER;
 }
 
 STATIC long long
-dataid_h48(const char *hk, char buf[static NISSY_SIZE_DATAID])
+dataid_h48(const char *str, char buf[static NISSY_SIZE_DATAID])
 {
-        uint8_t h, k;
+        uint8_t h;
         long long err;
 
-        err = parse_h48_hk(hk, &h, &k);
+        err = parse_h48h(str, &h);
         if (err < 0)
                 return err;
 
-        sprintf(buf, "h48h%" PRIu8 "k%" PRIu8 "%s", h, k,
-            k == 2 ? "i" : "");
+        sprintf(buf, "h48h%" PRIu8, h);
         return NISSY_OK;
 }