combined the enums into one

5 files changed, 20 insertions, 38 deletions

diff --git a/dbhandling.c b/dbhandling.c
index 338d0c6..8252ca0 100644
--- a/dbhandling.c
+++ b/dbhandling.c
@@ -8,7 +8,7 @@ void exit_with_error(sqlite3 *db, const char *msg)
     exit(69);
 }
 
-void select_from_table(sqlite3 *db, target_e target, char *qp)
+void select_from_table(sqlite3 *db, args_e target, char *qp)
 {
     char *sql;
     int rc;
@@ -59,7 +59,7 @@ void select_from_table(sqlite3 *db, target_e target, char *qp)
     free(query_param);
 }
 
-void update_entry(sqlite3 *db, target_e target, char *qp, char *value, char *status)
+void update_entry(sqlite3 *db, args_e target, char *qp, char *value, char *status)
 {
     char *sql;
     int rc;
@@ -110,7 +110,7 @@ void update_entry(sqlite3 *db, target_e target, char *qp, char *value, char *sta
     sqlite3_finalize(stmt);
 }
 
-void add_entry(sqlite3 *db, target_e target, char *name, char *value, char *status)
+void add_entry(sqlite3 *db, args_e target, char *name, char *value, char *status)
 {
     char *sql;
     int rc;
diff --git a/dbhandling.h b/dbhandling.h
index df54eba..042ad97 100644
--- a/dbhandling.h
+++ b/dbhandling.h
@@ -10,8 +10,8 @@
 #include "enum.h"
 
 void exit_with_error(sqlite3 *db, const char *msg);
-void select_from_table(sqlite3 *db, target_e target, char *qp);
-void update_entry(sqlite3 *db, target_e target, char *qp, char *value, char *status);
-void add_entry(sqlite3 *db, target_e target, char *name, char *value, char *status);
+void select_from_table(sqlite3 *db, args_e target, char *qp);
+void update_entry(sqlite3 *db, args_e target, char *qp, char *value, char *status);
+void add_entry(sqlite3 *db, args_e target, char *name, char *value, char *status);
 
 #endif
diff --git a/enum.c b/enum.c
index 34eeead..ba0828f 100644
--- a/enum.c
+++ b/enum.c
@@ -1,19 +1,11 @@
 #include "enum.h"
 
-mode_e str2enum_mode(const char *str)
+args_e str2enum(const char *str)
 {
-    for (size_t i = 0; i < sizeof(conversion_mode) / sizeof(conversion_mode[0]); ++i) {
-        if (!strcmp(str, conversion_mode[i].str))
-            return conversion_mode[i].val;
+    for (size_t i = 0; i < sizeof(conversion_args) / sizeof(conversion_args[0]); ++i) {
+        if (!strcmp(str, conversion_args[i].str))
+            return conversion_args[i].val;
     }
     return -1;
 }
 
-target_e str2enum_target(const char *str)
-{
-    for (size_t i = 0; i < sizeof(conversion_target) / sizeof(conversion_target[0]); ++i) {
-        if (!strcmp(str, conversion_target[i].str))
-            return conversion_target[i].val;
-    }
-    return -1;
-}
diff --git a/enum.h b/enum.h
index 68bbc99..bbe8ac6 100644
--- a/enum.h
+++ b/enum.h
@@ -4,34 +4,24 @@
 #include <string.h>
 
 typedef enum {
-    ANIME,
-    MANGA,
-} target_e;
-
-typedef enum {
     GET,
     SET,
     ADD,
-} mode_e;
+    ANIME,
+    MANGA,
+} args_e;
 
 static const struct {
-    mode_e val;
+    args_e val;
     const char *str;
-} conversion_mode [] = {
+} conversion_args [] = {
     {GET, "get"},
     {SET, "set"},
     {ADD, "add"},
-};
-
-static const struct {
-    target_e val;
-    const char *str;
-} conversion_target [] = {
     {ANIME, "anime"},
     {MANGA, "manga"},
 };
 
-mode_e str2enum_mode(const char *str);
-target_e str2enum_target(const char *str);
+args_e str2enum(const char *str);
 
 #endif
diff --git a/main.c b/main.c
index c67a976..337f353 100644
--- a/main.c
+++ b/main.c
@@ -8,7 +8,7 @@ const char *filepath = ".local/share/sqlite";
 const char *filename = "library.db";
 
 typedef struct {
-    target_e target;
+    args_e target;
     char *name;
     char *author;
     char *value;
@@ -30,7 +30,7 @@ void print_help(void)
 
 entry_t *set_entry(entry_t *entry, int argc, char **argv)
 {
-    entry->target = str2enum_target(argv[2]);
+    entry->target = str2enum(argv[2]);
     entry->name = argv[3];
     if (argc == 5) {
         entry->value = argv[4];
@@ -50,9 +50,9 @@ int main(int argc, char **argv)
         exit(69);
     }
 
-    mode_e mode;
+    args_e mode;
     entry_t *entry = malloc(sizeof(entry_t));
-    mode = str2enum_mode(argv[1]);
+    mode = str2enum(argv[1]);
 
     char fullpath[PATH_MAX];
     snprintf(fullpath, PATH_MAX, "%s/%s/%s", getenv("HOME"), filepath, filename);