1 files changed, 19 insertions, 12 deletions

diff --git a/test/test_table.c b/test/test_table.c
index f5a3a04..cf8ba33 100644
--- a/test/test_table.c
+++ b/test/test_table.c
@@ -20,43 +20,47 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "minunit.h"
-
 #include "io.h"
 #include "table.h"
 
+#include "minunit.h"
+
 
-char *test_table_list(void) {
+const char *test_table_list(void) {
     struct table_entry *root = calloc(sizeof(struct table_entry), 1);
     struct table_entry *next = calloc(sizeof(struct table_entry), 1);
     next->key = 0xffffffff;
     entry_append(root, next);
-    mu_assert("Table entry not inserted", root->next->key == 0xffffffff);
+    mu_assert("[table] test_table_list: Table entry not inserted",
+              root->next->key == 0xffffffff);
     entry_free(root);
     return NULL;
 }
 
 
-char *test_table_elif(void) {
+const char *test_table_elif(void) {
     struct stream *s = stream_new(10);
     struct table_entry *root = calloc(sizeof(struct table_entry), 1);
     stream_write(s, "\xff\xff\xff\xff\x01\x00\x41\x00\x00\x00", 10);
     stream_rewind(s);
     read_elif(s, root);
-    mu_assert("Table entry not inserted (eliF)", root->next != NULL);
-    mu_assert("Filename handling failure", !strcmp(root->next->filename, "A"));
+    mu_assert("[table] test_table_elif: Table entry not inserted (eliF)",
+              root->next != NULL);
+    mu_assert("[table] test_table_elif: Filename handling failure",
+              !strcmp(root->next->filename, "A"));
     free(root->next->filename);
     root->next->filename = NULL;
     stream_rewind(s);
     read_elif(s, root);
-    mu_assert("Existing entry ignored (eliF)", root->next->next == NULL);
+    mu_assert("[table] test_table_elif: Existing entry ignored (eliF)",
+              root->next->next == NULL);
     entry_free(root);
     stream_free(s);
     return NULL;
 }
 
 
-char *test_table_file(void) {
+const char *test_table_file(void) {
     struct stream *s = stream_new(0x100);
     struct table_entry *root = calloc(sizeof(struct table_entry), 1);
     stream_write(s, "\x61\x64\x6c\x72\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff"
@@ -69,11 +73,14 @@ char *test_table_file(void) {
                  "\x00\x00\x00\x00\x00\x00\x00\x00", 113);
     stream_rewind(s);
     read_file(s, root);
-    mu_assert("Table entry not inserted (eliF)", root->next != NULL);
-    mu_assert("Key read failure", root->next->key == 0xffffffff);
+    mu_assert("[table] test_table_file: Table entry not inserted (eliF)",
+              root->next != NULL);
+    mu_assert("[table] test_table_file: Key read failure",
+              root->next->key == 0xffffffff);
     root->next->ctime = 420;
     stream_rewind(s);
     read_file(s, root);
-    mu_assert("Existing entry ignored (eliF)", root->next->ctime == 0);
+    mu_assert("[table] test_table_file: Existing entry ignored (eliF)",
+              root->next->ctime == 0);
     return NULL;
 }