string_util: convert to C++

src/util/StringUtil.cxx

@@ -0,0 +1,46 @@
+/*
+ * 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
+ * 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 "StringUtil.hxx"
+
+#include <glib.h>
+
+#include <assert.h>
+
+const char *
+strchug_fast_c(const char *p)
+{
+	while (*p != 0 && g_ascii_isspace(*p))
+		++p;
+
+	return p;
+}
+
+bool
+string_array_contains(const char *const* haystack, const char *needle)
+{
+	assert(haystack != nullptr);
+	assert(needle != nullptr);
+
+	for (; *haystack != nullptr; ++haystack)
+		if (g_ascii_strcasecmp(*haystack, needle) == 0)
+			return true;
+
+	return false;
+}

src/util/StringUtil.hxx

@@ -0,0 +1,80 @@
+/*
+ * 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
+ * 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_HXX
+#define MPD_STRING_UTIL_HXX
+
+#include "gcc.h"
+
+/**
+ * Remove the "const" attribute from a string pointer.  This is a
+ * dirty hack, don't use it unless you know what you're doing!
+ */
+gcc_const
+static inline char *
+deconst_string(const char *p)
+{
+#ifdef __cplusplus
+	return const_cast<char *>(p);
+#else
+	union {
+		const char *in;
+		char *out;
+	} u = {
+		.in = p,
+	};
+
+	return u.out;
+#endif
+}
+
+/**
+ * Returns a pointer to the first non-whitespace character in the
+ * string, or to the end of the string.
+ *
+ * This is a faster version of g_strchug(), because it does not move
+ * data.
+ */
+gcc_pure
+const char *
+strchug_fast_c(const char *p);
+
+/**
+ * Same as strchug_fast_c(), but works with a writable pointer.
+ */
+gcc_pure
+static inline char *
+strchug_fast(char *p)
+{
+	return deconst_string(strchug_fast_c(p));
+}
+
+/**
+ * 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
+ */
+gcc_pure
+bool
+string_array_contains(const char *const* haystack, const char *needle);
+
+#endif

src/util/Tokenizer.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "Tokenizer.hxx"
-#include "string_util.h"
+#include "StringUtil.hxx"
 
 #include <glib.h>