Moved browser & opesys structures to their corresponding header files.

no2key · Jul 30, 2014 · 78f4f78 · 78f4f78
1 parent 538db5f
commit 78f4f78
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 13 deletions.
diff --git a/browsers.h b/browsers.h
@@ -21,6 +21,14 @@
 #ifndef BROWSERS_H_INCLUDED
 #define BROWSERS_H_INCLUDED
 
+#define BROWSER_TYPE_LEN 13
+
+typedef struct GBrowser_
+{
+  char browser_type[BROWSER_TYPE_LEN];
+  int hits;
+} GBrowser;
+
 char *verify_browser (char *str, char *browser_type);
 int is_crawler (const char *agent);
 

diff --git a/commons.h b/commons.h
@@ -70,9 +70,6 @@ extern size_t term_w;
 #define REQ_PROTO_LEN     9
 #define REQ_METHOD_LEN    8
 
-#define BROWSER_TYPE_LEN 10
-#define OPESYS_TYPE_LEN  10
-
 typedef enum
 {
   REQUEST,
@@ -135,17 +132,7 @@ typedef struct GHolder_
   int sub_items_size;           /* total number of sub items        */
 } GHolder;
 
-typedef struct GOpeSys_
-{
-  char os_type[OPESYS_TYPE_LEN];
-  int hits;
-} GOpeSys;
 
-typedef struct GBrowser_
-{
-  char browser_type[BROWSER_TYPE_LEN];
-  int hits;
-} GBrowser;
 
 float get_percentage (unsigned long long total, unsigned long long hit);
 void display_storage (void);

diff --git a/gdashboard.c b/gdashboard.c
@@ -43,8 +43,10 @@
 #include "geolocation.h"
 #endif
 
+#include "browsers.h"
 #include "error.h"
 #include "gdns.h"
+#include "opesys.h"
 #include "parser.h"
 #include "settings.h"
 #include "util.h"

diff --git a/glibht.c b/glibht.c
@@ -38,7 +38,9 @@
 #include "geolocation.h"
 #endif
 
+#include "browsers.h"
 #include "error.h"
+#include "opesys.h"
 #include "parser.h"
 #include "settings.h"
 #include "util.h"

diff --git a/opesys.h b/opesys.h
@@ -21,6 +21,14 @@
 #ifndef OPESYS_H_INCLUDED
 #define OPESYS_H_INCLUDED
 
+#define OPESYS_TYPE_LEN  10
+
+typedef struct GOpeSys_
+{
+  char os_type[OPESYS_TYPE_LEN];
+  int hits;
+} GOpeSys;
+
 char *verify_os (const char *str, char *os_type);
 
 #endif
diff --git a/tcabinet.c b/tcabinet.c
@@ -33,8 +33,10 @@
 #include "geolocation.h"
 #endif
 
+#include "browsers.h"
 #include "commons.h"
 #include "error.h"
+#include "opesys.h"
 #include "parser.h"
 #include "settings.h"
 #include "util.h"