aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-02-27 19:30:16 +0100
committerMax Kellermann <max@duempel.org>2009-02-27 19:30:16 +0100
commit7473fa0f4e481d565e0cb4610040adb7784bced8 (patch)
tree2a345c385a7df75439c0957d958cf4465a4c4840
parenteae0287466020b5b5aee137fb4599136420f89a2 (diff)
downloadmpd-7473fa0f4e481d565e0cb4610040adb7784bced8.tar.gz
mpd-7473fa0f4e481d565e0cb4610040adb7784bced8.tar.xz
mpd-7473fa0f4e481d565e0cb4610040adb7784bced8.zip
directory: moved DIRECTORY_* string constants
Moved some of them to to directory_save.c, and others to database.c.
-rw-r--r--src/database.c5
-rw-r--r--src/directory.h7
-rw-r--r--src/directory_save.c4
3 files changed, 9 insertions, 7 deletions
diff --git a/src/database.c b/src/database.c
index 413aebdfa..b1c47d4d4 100644
--- a/src/database.c
+++ b/src/database.c
@@ -38,6 +38,11 @@
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "database"
+#define DIRECTORY_INFO_BEGIN "info_begin"
+#define DIRECTORY_INFO_END "info_end"
+#define DIRECTORY_MPD_VERSION "mpd_version: "
+#define DIRECTORY_FS_CHARSET "fs_charset: "
+
static char *database_path;
static struct directory *music_root;
diff --git a/src/directory.h b/src/directory.h
index 36f0deb18..7ffb87d5e 100644
--- a/src/directory.h
+++ b/src/directory.h
@@ -26,13 +26,6 @@
#include <sys/types.h>
#define DIRECTORY_DIR "directory: "
-#define DIRECTORY_MTIME "mtime: " /* DEPRECATED, noop-read-only */
-#define DIRECTORY_BEGIN "begin: "
-#define DIRECTORY_END "end: "
-#define DIRECTORY_INFO_BEGIN "info_begin"
-#define DIRECTORY_INFO_END "info_end"
-#define DIRECTORY_MPD_VERSION "mpd_version: "
-#define DIRECTORY_FS_CHARSET "fs_charset: "
#define DEVICE_INARCHIVE (unsigned)(-1)
diff --git a/src/directory_save.c b/src/directory_save.c
index 50ae21fdf..7b2668bc7 100644
--- a/src/directory_save.c
+++ b/src/directory_save.c
@@ -28,6 +28,10 @@
#include <assert.h>
#include <string.h>
+#define DIRECTORY_MTIME "mtime: " /* DEPRECATED, noop-read-only */
+#define DIRECTORY_BEGIN "begin: "
+#define DIRECTORY_END "end: "
+
/* TODO error checking */
int
directory_save(FILE *fp, struct directory *directory)