From 7c8e83f655e41b11e970fd0abad5a96a3fb73e47 Mon Sep 17 00:00:00 2001
From: bpc2003 <wpesfriendnva@gmail.com>
Date: Mon, 10 Mar 2025 11:15:04 -0400
Subject: Consolidated each header into single header

---
 src/include/fileops.h |  9 ---------
 src/include/keytab.h  | 27 ---------------------------
 src/include/mdb.h     | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/include/parser.h  | 20 --------------------
 4 files changed, 48 insertions(+), 56 deletions(-)
 delete mode 100644 src/include/fileops.h
 delete mode 100644 src/include/keytab.h
 create mode 100644 src/include/mdb.h
 delete mode 100644 src/include/parser.h

(limited to 'src/include')

diff --git a/src/include/fileops.h b/src/include/fileops.h
deleted file mode 100644
index 371f6e8..0000000
--- a/src/include/fileops.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef FILEOPS_H
-#define FILEOPS_H
-
-#include "keytab.h"
-
-unsigned char *readdb(char *filename);
-void writedb(char *filename, struct keytablist *list, int len);
-
-#endif
diff --git a/src/include/keytab.h b/src/include/keytab.h
deleted file mode 100644
index 7e15643..0000000
--- a/src/include/keytab.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef KEYTAB_H
-#define KEYTAB_H
-
-#define TABLEN 1024
-
-union value {
-  char *str;
-  double num;
-  unsigned int b : 1;
-};
-
-struct keytab {
-  char *key;
-  int flag;
-  union value v;
-};
-
-struct keytablist {
-  struct keytab tab[TABLEN];
-};
-
-int *getkeys(struct keytablist *list, int id);
-struct keytab getkey(struct keytablist *list, int id, char *key);
-void setkey(struct keytablist **list, int *len, int id, char *pair);
-void delkey(struct keytablist *list, int id, char *key);
-
-#endif
diff --git a/src/include/mdb.h b/src/include/mdb.h
new file mode 100644
index 0000000..6e6fca9
--- /dev/null
+++ b/src/include/mdb.h
@@ -0,0 +1,48 @@
+#ifndef FILEOPS_H
+#define FILEOPS_H
+
+#define TABLEN 1024
+
+extern int blen;
+
+enum btype {
+  BEGIN = 1,
+  END, PAIR,
+
+  ERROR
+};
+
+struct byte {
+  enum btype type;
+  char *value;
+};
+
+struct byte *parse(unsigned char *buf);
+
+union value {
+  char *str;
+  double num;
+  unsigned int b : 1;
+};
+
+struct keytab {
+  char *key;
+  int flag;
+  union value v;
+};
+
+struct keytablist {
+  struct keytab tab[TABLEN];
+};
+
+int *getkeys(struct keytablist *list, int id);
+struct keytab getkey(struct keytablist *list, int id, char *key);
+void setkey(struct keytablist **list, int *len, int id, char *pair);
+void delkey(struct keytablist *list, int id, char *key);
+
+// TODO: integrate every header into single file
+// TODO: make readdb return struct keytab list*
+unsigned char *readdb(char *filename);
+void writedb(char *filename, struct keytablist *list, int len);
+
+#endif
diff --git a/src/include/parser.h b/src/include/parser.h
deleted file mode 100644
index 25045ae..0000000
--- a/src/include/parser.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef PARSER_H
-#define PARSER_H
-
-extern int blen;
-
-enum btype {
-  BEGIN = 1,
-  END, PAIR,
-
-  ERROR
-};
-
-struct byte {
-  enum btype type;
-  char *value;
-};
-
-struct byte *parse(unsigned char *buf);
-
-#endif
-- 
cgit v1.2.3