move structs into .h file

Signed-off-by: Mattias Andrée <maandree@operamail.com>

2 files changed, 81 insertions, 80 deletions

diff --git a/src/argparser.c b/src/argparser.c
index fcf6edd..7df379f 100644
--- a/src/argparser.c
+++ b/src/argparser.c
@@ -37,86 +37,6 @@ static long cmp(char* a, char* b);
 
 
 /**
- * Option structure
- */
-typedef struct
-{
-  /**
-   * The type of the option, either of: `ARGUMENTLESS`, `ARGUMENTED`, `VARIADIC`
-   */
-  long type;
-  
-  /**
-   * Alterative option names
-   */
-  char** alternatives;
-  
-  /**
-   * Number of elements in `alternatives`
-   */
-  long alternatives_count;
-  
-  /**
-   * Standard option name
-   */
-  char* standard;
-  
-  /**
-   * Argument name, not for argumentless options
-   */
-  char* argument;
-  
-  /**
-   * Help text, multi-line
-   */
-  char* help;
-  
-} args_Option;
-
-
-/**
- * char* to void* map structure
- */
-typedef struct
-{
-  /**
-   * Available keys
-   */
-  char** keys;
-  
-  /**
-   * The number of available keys
-   */
-  long key_count;
-  
-  /**
-   * Indefinite depth array with 17 elements per level, the last being the value at the position
-   */
-  void** data;
-  
-} args_Map;
-
-
-/**
- * Array with associated length
- */
-typedef struct
-{
-  /**
-   * The values
-   */
-  void** values;
-  
-  /**
-   * The length of `values`
-   */
-  long count;
-  
-} args_Array;
-
-
-
-/**
  * Whether the Linux VT is being used
  */
 static long args_linuxvt;
diff --git a/src/argparser.h b/src/argparser.h
index 288c585..19629ce 100644
--- a/src/argparser.h
+++ b/src/argparser.h
@@ -19,3 +19,84 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
+
+
+/**
+ * Option structure
+ */
+typedef struct
+{
+  /**
+   * The type of the option, either of: `ARGUMENTLESS`, `ARGUMENTED`, `VARIADIC`
+   */
+  long type;
+  
+  /**
+   * Alterative option names
+   */
+  char** alternatives;
+  
+  /**
+   * Number of elements in `alternatives`
+   */
+  long alternatives_count;
+  
+  /**
+   * Standard option name
+   */
+  char* standard;
+  
+  /**
+   * Argument name, not for argumentless options
+   */
+  char* argument;
+  
+  /**
+   * Help text, multi-line
+   */
+  char* help;
+  
+} args_Option;
+
+
+/**
+ * char* to void* map structure
+ */
+typedef struct
+{
+  /**
+   * Available keys
+   */
+  char** keys;
+  
+  /**
+   * The number of available keys
+   */
+  long key_count;
+  
+  /**
+   * Indefinite depth array with 17 elements per level, the last being the value at the position
+   */
+  void** data;
+  
+} args_Map;
+
+
+/**
+ * Array with associated length
+ */
+typedef struct
+{
+  /**
+   * The values
+   */
+  void** values;
+  
+  /**
+   * The length of `values`
+   */
+  long count;
+  
+} args_Array;
+
+