logswan

commit 75d6f9fac2d79fad60d21e8008c55219448d8b3e
parent 8c38683650bb529ad67bf4c58179c586e133c129
Author: Frederic Cambus <fcambus@users.sourceforge.net>
Date:   Sun, 20 Dec 2015 19:20:07 +0100

Moving the results structure in 'output.h'

Diffstat:
M
src/output.c
 | 
2
+-
M
src/output.h
 | 
24
+++++++++++++++++++++++-
M
src/results.h
 | 
41
-----------------------------------------

3 files changed, 24 insertions(+), 43 deletions(-)
diff --git a/src/output.c b/src/output.c
@@ -15,7 +15,7 @@
 #include <jansson.h>
 
 #include "config.h"
-#include "results.h"
+#include "output.h"
 
 char *output(Results results) {
 	json_t *jsonObject = json_object();
diff --git a/src/output.h b/src/output.h
@@ -14,7 +14,29 @@
 #ifndef OUTPUT_H
 #define OUTPUT_H
 
-#include "results.h"
+struct results {
+	char *fileName;
+	uint64_t fileSize;
+	uint64_t invalidLines;
+	uint64_t processedLines;
+	uint64_t bandwidth;
+	uint64_t hits;
+	uint64_t hitsIPv4;
+	uint64_t hitsIPv6;
+	uint64_t visits;
+	uint64_t visitsIPv4;
+	uint64_t visitsIPv6;
+	uint64_t continents[CONTINENTS];
+	uint64_t countries[255];
+	uint64_t hours[24];
+	uint64_t status[STATUS_CODE_MAX];
+	double runtime;
+	char timeStamp[20];
+	uint64_t protocols[PROTOCOLS];
+	uint64_t methods[METHODS];
+};
+
+typedef struct results Results;
 
 char *output(Results);
 
diff --git a/src/results.h b/src/results.h
@@ -1,41 +0,0 @@
-/*****************************************************************************/
-/*                                                                           */
-/* Logswan 1.02 (c) by Frederic Cambus 2015                                  */
-/* https://github.com/fcambus/logswan                                        */
-/*                                                                           */
-/* Created:      2015/05/31                                                  */
-/* Last Updated: 2015/12/19                                                  */
-/*                                                                           */
-/* Logswan is released under the BSD 3-Clause license.                       */
-/* See LICENSE file for details.                                             */
-/*                                                                           */
-/*****************************************************************************/
-
-#ifndef RESULTS_H
-#define RESULTS_H
-
-struct results {
-	char *fileName;
-	uint64_t fileSize;
-	uint64_t invalidLines;
-	uint64_t processedLines;
-	uint64_t bandwidth;
-	uint64_t hits;
-	uint64_t hitsIPv4;
-	uint64_t hitsIPv6;
-	uint64_t visits;
-	uint64_t visitsIPv4;
-	uint64_t visitsIPv6;
-	uint64_t continents[CONTINENTS];
-	uint64_t countries[255];
-	uint64_t hours[24];
-	uint64_t status[STATUS_CODE_MAX];
-	double runtime;
-	char timeStamp[20];
-	uint64_t protocols[PROTOCOLS];
-	uint64_t methods[METHODS];
-};
-
-typedef struct results Results;
-
-#endif /* RESULTS_H */