summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Härdeman <david@hardeman.nu>2020-06-22 12:11:18 +0200
committerDavid Härdeman <david@hardeman.nu>2020-06-22 12:11:18 +0200
commitd74bcf2dadfa4fc6c432ba0585b6dc4a77e81f0e (patch)
tree3f7dd80af0541dab9937399693986285146229bd
parent28eab34ecea8b3677808c00cebbf4bd3227f8c68 (diff)
Rename config to config-parse
-rw-r--r--config-parse.c (renamed from config.c)2
-rw-r--r--config-parse.h (renamed from config.h)4
-rw-r--r--idle.c1
-rw-r--r--main.c2
-rw-r--r--meson.build2
-rw-r--r--server-config.c2
-rw-r--r--server.c2
7 files changed, 7 insertions, 8 deletions
diff --git a/config.c b/config-parse.c
index eb980f8..34fbc64 100644
--- a/config.c
+++ b/config-parse.c
@@ -10,7 +10,7 @@
#include "main.h"
#include "uring.h"
-#include "config.h"
+#include "config-parse.h"
#include "server.h"
static void
diff --git a/config.h b/config-parse.h
index a88be90..c8d10dc 100644
--- a/config.h
+++ b/config-parse.h
@@ -1,5 +1,5 @@
-#ifndef fooconfighfoo
-#define fooconfighfoo
+#ifndef fooconfigparsehfoo
+#define fooconfigparsehfoo
#define _GNU_SOURCE
#include <sys/types.h>
diff --git a/idle.c b/idle.c
index 15abd72..e0eb525 100644
--- a/idle.c
+++ b/idle.c
@@ -10,7 +10,6 @@
#include "main.h"
#include "uring.h"
-#include "config.h"
#include "server.h"
#include "idle.h"
diff --git a/main.c b/main.c
index 1dbc3c2..c1c9f8f 100644
--- a/main.c
+++ b/main.c
@@ -19,7 +19,7 @@
#include "main.h"
#include "uring.h"
-#include "config.h"
+#include "config-parse.h"
#include "server.h"
#include "server-config.h"
#include "announce.h"
diff --git a/meson.build b/meson.build
index a4472cd..9348482 100644
--- a/meson.build
+++ b/meson.build
@@ -11,7 +11,7 @@ mcproxy_sources = [
'server-proxy.c',
'server-config.c',
'announce.c',
- 'config.c',
+ 'config-parse.c',
'rcon.c',
'idle.c',
'igmp.c',
diff --git a/server-config.c b/server-config.c
index d42022b..03259ca 100644
--- a/server-config.c
+++ b/server-config.c
@@ -12,7 +12,7 @@
#include "main.h"
#include "uring.h"
-#include "config.h"
+#include "config-parse.h"
#include "server.h"
#include "server-config.h"
diff --git a/server.c b/server.c
index 55072c0..7c2bf52 100644
--- a/server.c
+++ b/server.c
@@ -16,7 +16,7 @@
#include "server.h"
#include "server-proxy.h"
#include "utils.h"
-#include "config.h"
+#include "config-parse.h"
#include "idle.h"
#include "rcon.h"
#include "systemd.h"