Fixed header inclusions across command files.

6 files changed, 14 insertions, 14 deletions

diff --git a/command_service.c b/command_service.c
index bfbc2cb..3a594aa 100644
--- a/command_service.c
+++ b/command_service.c
@@ -1,5 +1,5 @@
 #include "command_service.h"
-#include "server_commands.h"
+#include "commands.h"
 
 #include <gio/gio.h>
 
@@ -35,7 +35,7 @@ static gboolean service_incoming(GSocketService *service,
 		}
 		*pos = '\0';
 
-		server_commands_handle(connection, buffer);
+		commands_handle(connection, buffer);
 	}
 
 	return FALSE;
diff --git a/commands.c b/commands.c
index 4442a1b..1e59449 100644
--- a/commands.c
+++ b/commands.c
@@ -1,4 +1,4 @@
-#include "server_commands.h"
+#include "commands.h"
 #include "music.h"
 
 static void send_404(GSocketConnection *connection) {
@@ -63,7 +63,7 @@ static void commands_list(GSocketConnection *connection, const gchar *cmd) {
 	g_string_free(string, TRUE);
 }
 
-void server_commands_handle(GSocketConnection *connection, const gchar *cmd) {
+void commands_handle(GSocketConnection *connection, const gchar *cmd) {
 	g_debug(cmd);
 	if(g_strncasecmp(cmd, "list", 4) == 0) {
 		commands_list(connection, cmd);
diff --git a/commands.h b/commands.h
index 3a073b3..4f5c24c 100644
--- a/commands.h
+++ b/commands.h
@@ -1,9 +1,9 @@
-#ifndef _SERVER_COMMANDS_H_
-#define _SERVER_COMMANDS_H_
+#ifndef _COMMANDS_H_
+#define _COMMANDS_H_
 
 #include <glib.h>
 #include <gio/gio.h>
 
-void server_commands_handle(GSocketConnection *connection, const gchar *cmd);
+void commands_handle(GSocketConnection *connection, const gchar *cmd);
 
 #endif
diff --git a/httpd.c b/httpd.c
index 744871f..6e95730 100644
--- a/httpd.c
+++ b/httpd.c
@@ -1,5 +1,5 @@
 #include "httpd.h"
-#include "commands.h"
+#include "httpd_commands.h"
 
 #include <gio/gio.h>
 #include <string.h>
@@ -66,7 +66,7 @@ static gboolean service_incoming(GSocketService *service,
 
 	g_strfreev(data);
 
-	commands_handle(connection, path);
+	httpd_commands_handle(connection, path);
 
 	g_free(path);
 
diff --git a/httpd_commands.c b/httpd_commands.c
index c77d7c8..d0029a2 100644
--- a/httpd_commands.c
+++ b/httpd_commands.c
@@ -1,4 +1,4 @@
-#include "commands.h"
+#include "httpd_commands.h"
 #include "music.h"
 #include "transcode.h"
 #include "decoder.h"
@@ -171,7 +171,7 @@ commands_get_mp3_free_path:
 	g_free(path);
 }
 
-void commands_handle(GSocketConnection *connection, const gchar *cmd) {
+void httpd_commands_handle(GSocketConnection *connection, const gchar *cmd) {
 	g_debug("handling command string %s", cmd);
 	if(g_ascii_strncasecmp(cmd, "/get_raw", 8) == 0) {
 		commands_get_raw(connection, cmd);
diff --git a/httpd_commands.h b/httpd_commands.h
index 7b90f95..86b3da0 100644
--- a/httpd_commands.h
+++ b/httpd_commands.h
@@ -1,8 +1,8 @@
-#ifndef _COMMANDS_H_
-#define _COMMANDS_H_
+#ifndef _HTTPD_COMMANDS_H_
+#define _HTTPD_COMMANDS_H_
 
 #include <gio/gio.h>
 
-void commands_handle(GSocketConnection *connection, const gchar *cmd);
+void httpd_commands_handle(GSocketConnection *connection, const gchar *cmd);
 
 #endif