Add freqent helper functions

include/db.h

@@ -10,19 +10,13 @@
 // An opaque struct
 typedef struct database_s database_t;
 
-typedef struct {
-    s8 word;
-    s8 reading;
-    u32 frequency;
-} frequency_entry;
-
 database_t *_nonnull_ db_open(char *dbpath, bool readonly);
 void _nonnull_ db_close(database_t *db);
 
 void _nonnull_ db_put_dictent(database_t *db, s8 headword, dictentry de);
 void _nonnull_ db_get_dictents(const database_t *db, s8 headword, dictentry *dict[static 1]);
 
-void _nonnull_ db_put_freq(const database_t *db, frequency_entry fe);
+void _nonnull_ db_put_freq(const database_t *db, freqentry fe);
 
 /*
  * Checks if there exists a database in the provided path

include/util.h

@@ -2,7 +2,6 @@
 #define DP_UTIL_H
 
 #include "buf.h"    // growable buffer implementation
-#include <dirent.h> // DIR
 #include <stdio.h>  // FILE
 #include <unistd.h> // close()
 
@@ -169,6 +168,15 @@ void _nonnull_ dictionary_free(dictentry **dict);
 dictentry dictentry_at_index(dictentry *dict, size index);
 /* --------------------- End dictentry ------------------------ */
 
+typedef struct {
+    s8 word;
+    s8 reading;
+    u32 frequency;
+} freqentry;
+
+freqentry freqentry_dup(freqentry fe);
+void freqentry_free(freqentry *fe);
+
 size_t _printf_(3, 4) snprintf_safe(char *buf, size_t len, const char *fmt, ...);
 
 void nuke_whitespace(s8 *z);

src/db.c

@@ -139,7 +139,7 @@ static u32 *getids(const database_t *db, s8 word, size_t *num) {
     return ret;
 }
 
-void db_put_freq(const database_t *db, frequency_entry fe) {
+void db_put_freq(const database_t *db, freqentry fe) {
     die_on(db->readonly, "Cannot put frequency into db in readonly mode.");
 
     s8 key = concat(fe.word, S("\0"), fe.reading);

src/util.c

@@ -58,6 +58,11 @@ s8 news8(size len) {
 }
 
 s8 s8dup(s8 src) {
+#ifdef UNIT_TEST
+    if (!src.s)
+        return (s8){0};
+#endif
+
     s8 r = news8(src.len);
     s8copy(r, src);
     return r;