Remove a bin when it becomes empty.

[mnemon] / mnemon.c

diff --git a/mnemon.c b/mnemon.c
index c0efa6902e50281e91a5d4cc699ab40a6041bd70..67b5889dcfa1040d56c17a33bad250906bd94420 100644 (file)
--- a/mnemon.c
+++ b/mnemon.c
@@ -379,6 +379,16 @@ mnemon_get_bin (mnemon_t   *mnemon,
     return bin;
 }
 
+static void
+mnemon_remove_bin (mnemon_t    *mnemon,
+                  bin_t        *bin)
+{
+    int i = bin - mnemon->bins;
+
+    memmove (bin, bin + 1, (mnemon->num_bins - i) * sizeof (bin_t));
+    mnemon->num_bins--;
+}
+
 static void
 chomp (char *s)
 {
@@ -633,6 +643,8 @@ mnemon_do_challenges (mnemon_t *mnemon)
        correct = (strcmp (response, item->response) == 0);
 
        bin_remove_item (bin, item_index);
+       if (bin->num_items == 0)
+           mnemon_remove_bin (mnemon, bin);
 
        if (correct) {
            printf ("Correct!\n\n");
@@ -660,7 +672,7 @@ main (int argc, char *argv[])
 {
     mnemon_t mnemon;
 
-    srand (time (NULL));
+    srand (1);
 
     mnemon_init (&mnemon);