directory: moved DIRECTORY_* string constants

Moved some of them to to directory_save.c, and others to database.c.

directory: moved DIRECTORY_* string constants
7473fa0f · Max Kellermann · eae02874 · 7473fa0f · 7473fa0f · 7473fa0f
Commit 7473fa0f authored Feb 27, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 7 deletions

database.c src/database.c +5 -0

directory.h src/directory.h +0 -7

directory_save.c src/directory_save.c +4 -0

No files found.
--- 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;

--- 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)


--- 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)