Move main.c to minecproxy.c for consistency and better debug msgs

14 files changed, 15 insertions, 15 deletions

diff --git a/minecproxy/announce.c b/minecproxy/announce.c
index 4193a75..3e4a31e 100644
--- a/minecproxy/announce.c
+++ b/minecproxy/announce.c
@@ -6,7 +6,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "main.h"
+#include "minecproxy.h"
 #include "uring.h"
 #include "announce.h"
 #include "server.h"
diff --git a/minecproxy/idle.c b/minecproxy/idle.c
index b4f804f..8393ff9 100644
--- a/minecproxy/idle.c
+++ b/minecproxy/idle.c
@@ -7,7 +7,7 @@
 #include <ctype.h>
 #include <errno.h>
 
-#include "main.h"
+#include "minecproxy.h"
 #include "uring.h"
 #include "server.h"
 #include "idle.h"
diff --git a/minecproxy/igmp.c b/minecproxy/igmp.c
index 591ac4f..bf46844 100644
--- a/minecproxy/igmp.c
+++ b/minecproxy/igmp.c
@@ -13,7 +13,7 @@
 #include <errno.h>
 #include <sys/ioctl.h>
 
-#include "main.h"
+#include "minecproxy.h"
 #include "uring.h"
 #include "igmp.h"
 #include "announce.h"
diff --git a/minecproxy/meson.build b/minecproxy/meson.build
index 155840c..3fc6b48 100644
--- a/minecproxy/meson.build
+++ b/minecproxy/meson.build
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 minecproxy_sources = [
-	'main.c',
+	'minecproxy.c',
 	'uring.c',
 	'signal-handler.c',
 	'server.c',
diff --git a/minecproxy/main.c b/minecproxy/minecproxy.c
index 92065cc..7448943 100644
--- a/minecproxy/main.c
+++ b/minecproxy/minecproxy.c
@@ -17,7 +17,7 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 
-#include "main.h"
+#include "minecproxy.h"
 #include "signal-handler.h"
 #include "uring.h"
 #include "shared/config-parser.h"
diff --git a/minecproxy/main.h b/minecproxy/minecproxy.h
index f7dd547..adb82c6 100644
--- a/minecproxy/main.h
+++ b/minecproxy/minecproxy.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
-#ifndef foomainhfoo
-#define foomainhfoo
+#ifndef foominecproxyhfoo
+#define foominecproxyhfoo
 
 #include <sys/socket.h>
 #include <netinet/ip.h>
diff --git a/minecproxy/misc.c b/minecproxy/misc.c
index 5687a3b..fa9d615 100644
--- a/minecproxy/misc.c
+++ b/minecproxy/misc.c
@@ -14,7 +14,7 @@
 #include <netinet/tcp.h>
 #include <inttypes.h>
 
-#include "main.h"
+#include "minecproxy.h"
 #include "misc.h"
 #include "uring.h"
 
diff --git a/minecproxy/ptimer.c b/minecproxy/ptimer.c
index 1ef7609..e84af24 100644
--- a/minecproxy/ptimer.c
+++ b/minecproxy/ptimer.c
@@ -5,7 +5,7 @@
 #include <unistd.h>
 #include <time.h>
 
-#include "main.h"
+#include "minecproxy.h"
 #include "uring.h"
 #include "ptimer.h"
 
diff --git a/minecproxy/server-config.c b/minecproxy/server-config.c
index 4e77716..4f8789f 100644
--- a/minecproxy/server-config.c
+++ b/minecproxy/server-config.c
@@ -10,7 +10,7 @@
 #include <arpa/inet.h>
 #include <inttypes.h>
 
-#include "main.h"
+#include "minecproxy.h"
 #include "uring.h"
 #include "shared/config-parser.h"
 #include "server.h"
diff --git a/minecproxy/server-proxy.c b/minecproxy/server-proxy.c
index ac41594..d357396 100644
--- a/minecproxy/server-proxy.c
+++ b/minecproxy/server-proxy.c
@@ -8,7 +8,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "main.h"
+#include "minecproxy.h"
 #include "uring.h"
 #include "ptimer.h"
 #include "server.h"
diff --git a/minecproxy/server-rcon.c b/minecproxy/server-rcon.c
index a728bab..81a526c 100644
--- a/minecproxy/server-rcon.c
+++ b/minecproxy/server-rcon.c
@@ -11,7 +11,7 @@
 #include <inttypes.h>
 #include <errno.h>
 
-#include "main.h"
+#include "minecproxy.h"
 #include "uring.h"
 #include "server.h"
 #include "server-rcon.h"
diff --git a/minecproxy/server.c b/minecproxy/server.c
index 341a353..7e6aa84 100644
--- a/minecproxy/server.c
+++ b/minecproxy/server.c
@@ -11,7 +11,7 @@
 #include <errno.h>
 #include <sched.h>
 
-#include "main.h"
+#include "minecproxy.h"
 #include "uring.h"
 #include "ptimer.h"
 #include "server.h"
diff --git a/minecproxy/signal-handler.c b/minecproxy/signal-handler.c
index 56d016f..8c70f97 100644
--- a/minecproxy/signal-handler.c
+++ b/minecproxy/signal-handler.c
@@ -5,7 +5,7 @@
 #include <unistd.h>
 #include <systemd/sd-daemon.h>
 
-#include "main.h"
+#include "minecproxy.h"
 #include "signal-handler.h"
 #include "uring.h"
 #include "server.h"
diff --git a/minecproxy/uring.c b/minecproxy/uring.c
index d16abac..6748fca 100644
--- a/minecproxy/uring.c
+++ b/minecproxy/uring.c
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "main.h"
+#include "minecproxy.h"
 #include "uring.h"
 
 struct uring_ev {