12 files changed, 19 insertions, 42 deletions
diff --git a/src/ArchiveList.cxx b/src/ArchiveList.cxx
index 02b19ce79..894e31031 100644
--- a/src/ArchiveList.cxx
+++ b/src/ArchiveList.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "ArchiveList.hxx"
 #include "ArchivePlugin.hxx"
-#include "string_util.h"
+#include "util/StringUtil.hxx"
 #include "archive/Bzip2ArchivePlugin.hxx"
 #include "archive/Iso9660ArchivePlugin.hxx"
 #include "archive/ZzipArchivePlugin.hxx"
diff --git a/src/ConfigFile.cxx b/src/ConfigFile.cxx
index f7f525096..2573f66e5 100644
--- a/src/ConfigFile.cxx
+++ b/src/ConfigFile.cxx
@@ -24,11 +24,7 @@
 #include "ConfigTemplates.hxx"
 #include "conf.h"
 #include "util/Tokenizer.hxx"
-
-extern "C" {
-#include "string_util.h"
-}
-
+#include "util/StringUtil.hxx"
 #include "fs/Path.hxx"
 #include "fs/FileSystem.hxx"
 
diff --git a/src/ConfigParser.cxx b/src/ConfigParser.cxx
index 9798b6edd..73381d8a0 100644
--- a/src/ConfigParser.cxx
+++ b/src/ConfigParser.cxx
@@ -18,10 +18,7 @@
  */
 
 #include "ConfigParser.hxx"
-
-extern "C" {
-#include "string_util.h"
-}
+#include "util/StringUtil.hxx"
 
 bool
 get_bool(const char *value, bool *value_r)
diff --git a/src/DecoderPlugin.cxx b/src/DecoderPlugin.cxx
index ccea032de..bcee3ac66 100644
--- a/src/DecoderPlugin.cxx
+++ b/src/DecoderPlugin.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "decoder_plugin.h"
-#include "string_util.h"
+#include "util/StringUtil.hxx"
 
 #include <assert.h>
 
diff --git a/src/PlaylistDatabase.cxx b/src/PlaylistDatabase.cxx
index edc6a2815..c5cfc8397 100644
--- a/src/PlaylistDatabase.cxx
+++ b/src/PlaylistDatabase.cxx
@@ -21,10 +21,7 @@
 #include "PlaylistDatabase.hxx"
 #include "PlaylistVector.hxx"
 #include "TextFile.hxx"
-
-extern "C" {
-#include "string_util.h"
-}
+#include "util/StringUtil.hxx"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/PlaylistRegistry.cxx b/src/PlaylistRegistry.cxx
index d764a2ec2..5e8b453df 100644
--- a/src/PlaylistRegistry.cxx
+++ b/src/PlaylistRegistry.cxx
@@ -33,8 +33,7 @@
 #include "playlist/EmbeddedCuePlaylistPlugin.hxx"
 #include "input_stream.h"
 #include "util/UriUtil.hxx"
-
-#include "string_util.h"
+#include "util/StringUtil.hxx"
 #include "conf.h"
 #include "mpd_error.h"
 
diff --git a/src/SongSave.cxx b/src/SongSave.cxx
index 2b74d9354..c3796235b 100644
--- a/src/SongSave.cxx
+++ b/src/SongSave.cxx
@@ -24,10 +24,7 @@
 #include "Directory.hxx"
 #include "TextFile.hxx"
 #include "tag.h"
-
-extern "C" {
-#include "string_util.h"
-}
+#include "util/StringUtil.hxx"
 
 #include <glib.h>
 
diff --git a/src/cue/CueParser.cxx b/src/cue/CueParser.cxx
index 55c619cd8..915499f44 100644
--- a/src/cue/CueParser.cxx
+++ b/src/cue/CueParser.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "CueParser.hxx"
-#include "string_util.h"
+#include "util/StringUtil.hxx"
 #include "song.h"
 #include "tag.h"
 
diff --git a/src/playlist/ExtM3uPlaylistPlugin.cxx b/src/playlist/ExtM3uPlaylistPlugin.cxx
index ce026dab8..2043bea52 100644
--- a/src/playlist/ExtM3uPlaylistPlugin.cxx
+++ b/src/playlist/ExtM3uPlaylistPlugin.cxx
@@ -22,7 +22,7 @@
 #include "PlaylistPlugin.hxx"
 #include "song.h"
 #include "tag.h"
-#include "string_util.h"
+#include "util/StringUtil.hxx"
 
 extern "C" {
 #include "text_input_stream.h"
diff --git a/src/string_util.c b/src/util/StringUtil.cxx
index 00c36892b..87d032735 100644
--- a/src/string_util.c
+++ b/src/util/StringUtil.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "string_util.h"
+#include "StringUtil.hxx"
 
 #include <glib.h>
 
@@ -35,10 +35,10 @@ strchug_fast_c(const char *p)
 bool
 string_array_contains(const char *const* haystack, const char *needle)
 {
-	assert(haystack != NULL);
-	assert(needle != NULL);
+	assert(haystack != nullptr);
+	assert(needle != nullptr);
 
-	for (; *haystack != NULL; ++haystack)
+	for (; *haystack != nullptr; ++haystack)
 		if (g_ascii_strcasecmp(*haystack, needle) == 0)
 			return true;
 
diff --git a/src/string_util.h b/src/util/StringUtil.hxx
index 5b76c980b..72d613798 100644
--- a/src/string_util.h
+++ b/src/util/StringUtil.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,17 +17,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPD_STRING_UTIL_H
-#define MPD_STRING_UTIL_H
+#ifndef MPD_STRING_UTIL_HXX
+#define MPD_STRING_UTIL_HXX
 
 #include "gcc.h"
 
-#include <stdbool.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Remove the "const" attribute from a string pointer.  This is a
  * dirty hack, don't use it unless you know what you're doing!
@@ -79,11 +73,8 @@ strchug_fast(char *p)
  * case-insensitive for ASCII characters
  * @return true if found
  */
+gcc_pure
 bool
 string_array_contains(const char *const* haystack, const char *needle);
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif 
-
 #endif
diff --git a/src/util/Tokenizer.cxx b/src/util/Tokenizer.cxx
index 9ade0d1b1..2d6c2b434 100644
--- a/src/util/Tokenizer.cxx
+++ b/src/util/Tokenizer.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "Tokenizer.hxx"
-#include "string_util.h"
+#include "StringUtil.hxx"
 
 #include <glib.h>