utils: move string_array_contains() to string_util.c

8 files changed, 78 insertions, 27 deletions

diff --git a/src/archive_list.c b/src/archive_list.c
index 2656726b5..648f68575 100644
--- a/src/archive_list.c
+++ b/src/archive_list.c
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "archive_list.h"
 #include "archive_plugin.h"
-#include "utils.h"
+#include "string_util.h"
 #include "archive/bz2_archive_plugin.h"
 #include "archive/iso9660_archive_plugin.h"
 #include "archive/zzip_archive_plugin.h"
diff --git a/src/conf.c b/src/conf.c
index 705942085..3310da17e 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -20,6 +20,7 @@
 #include "config.h"
 #include "conf.h"
 #include "utils.h"
+#include "string_util.h"
 #include "tokenizer.h"
 #include "path.h"
 #include "glib_compat.h"
diff --git a/src/decoder_plugin.c b/src/decoder_plugin.c
index 062dad364..62f85a645 100644
--- a/src/decoder_plugin.c
+++ b/src/decoder_plugin.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "decoder_plugin.h"
-#include "utils.h"
+#include "string_util.h"
 
 #include <assert.h>
 
diff --git a/src/playlist_list.c b/src/playlist_list.c
index 019654bfc..02d650c05 100644
--- a/src/playlist_list.c
+++ b/src/playlist_list.c
@@ -31,7 +31,7 @@
 #include "playlist/flac_playlist_plugin.h"
 #include "input_stream.h"
 #include "uri.h"
-#include "utils.h"
+#include "string_util.h"
 #include "conf.h"
 #include "glib_compat.h"
 #include "mpd_error.h"
diff --git a/src/string_util.c b/src/string_util.c
new file mode 100644
index 000000000..b93292854
--- /dev/null
+++ b/src/string_util.c
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "string_util.h"
+
+#include <glib.h>
+
+#include <assert.h>
+
+bool
+string_array_contains(const char *const* haystack, const char *needle)
+{
+	assert(haystack != NULL);
+	assert(needle != NULL);
+
+	for (; *haystack != NULL; ++haystack)
+		if (g_ascii_strcasecmp(*haystack, needle) == 0)
+			return true;
+
+	return false;
+}
diff --git a/src/string_util.h b/src/string_util.h
new file mode 100644
index 000000000..df8ceeef3
--- /dev/null
+++ b/src/string_util.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_STRING_UTIL_H
+#define MPD_STRING_UTIL_H
+
+#include <stdbool.h>
+
+/**
+ * Checks whether a string array contains the specified string.
+ *
+ * @param haystack a NULL terminated list of strings
+ * @param needle the string to search for; the comparison is
+ * case-insensitive for ASCII characters
+ * @return true if found
+ */
+bool
+string_array_contains(const char *const* haystack, const char *needle);
+
+#endif
diff --git a/src/utils.c b/src/utils.c
index 53494cc5d..39f4fe4d1 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -101,16 +101,3 @@ char *parsePath(char *path)
 	}
 #endif
 }
-
-bool
-string_array_contains(const char *const* haystack, const char *needle)
-{
-	assert(haystack != NULL);
-	assert(needle != NULL);
-
-	for (; *haystack != NULL; ++haystack)
-		if (g_ascii_strcasecmp(*haystack, needle) == 0)
-			return true;
-
-	return false;
-}
diff --git a/src/utils.h b/src/utils.h
index 629056637..3941643dc 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -33,15 +33,4 @@
 
 char *parsePath(char *path);
 
-/**
- * Checks whether a string array contains the specified string.
- *
- * @param haystack a NULL terminated list of strings
- * @param needle the string to search for; the comparison is
- * case-insensitive for ASCII characters
- * @return true if found
- */
-bool
-string_array_contains(const char *const* haystack, const char *needle);
-
 #endif