commit 8c38683650bb529ad67bf4c58179c586e133c129
parent 757d9f12229f11fc7a6b068fd9bfd5254d21488a
Author: Frederic Cambus <fcambus@users.sourceforge.net>
Date: Sat, 19 Dec 2015 16:53:21 +0100
Moving all constants previously defined in 'logswan.h' to 'config.h'
Diffstat:
4 files changed, 12 insertions(+), 31 deletions(-)
diff --git a/src/config.h b/src/config.h
@@ -14,6 +14,18 @@
#ifndef CONFIG_H
#define CONFIG_H
+#define VERSION "Logswan 1.02"
+
+enum {
+ HLL_BITS = 20,
+ LINE_MAX_LENGTH = 65536,
+ STATUS_CODE_MAX = 512,
+
+ CONTINENTS = 6,
+ METHODS = 9,
+ PROTOCOLS = 2
+};
+
extern char *continentsId[];
extern char *continentsNames[];
extern char *methods[];
diff --git a/src/logswan.c b/src/logswan.c
@@ -29,7 +29,6 @@
#include <GeoIP.h>
-#include "logswan.h"
#include "config.h"
#include "output.h"
#include "parse.h"
diff --git a/src/logswan.h b/src/logswan.h
@@ -1,29 +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 LOGSWAN_H
-#define LOGSWAN_H
-
-#define VERSION "Logswan 1.02"
-
-enum {
- HLL_BITS = 20,
- LINE_MAX_LENGTH = 65536,
- STATUS_CODE_MAX = 512,
-
- CONTINENTS = 6,
- METHODS = 9,
- PROTOCOLS = 2
-};
-
-#endif /* LOGSWAN_H */
diff --git a/src/output.c b/src/output.c
@@ -14,7 +14,6 @@
#include <GeoIP.h>
#include <jansson.h>
-#include "logswan.h"
#include "config.h"
#include "results.h"
