Util/ASCII: add function StringEqualsCaseASCII()

Replaces GLib's g_ascii_strcasecmp().

2 files changed, 56 insertions, 3 deletions

diff --git a/src/util/ASCII.hxx b/src/util/ASCII.hxx
new file mode 100644
index 000000000..0d4c8f35b
--- /dev/null
+++ b/src/util/ASCII.hxx
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2013 Max Kellermann <max@duempel.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef MPD_ASCII_HXX
+#define MPD_ASCII_HXX
+
+#include "Compiler.h"
+
+#include <assert.h>
+#include <string.h>
+
+/**
+ * Determine whether two strings are equal, ignoring case for ASCII
+ * letters.
+ */
+gcc_pure gcc_nonnull_all
+static inline bool
+StringEqualsCaseASCII(const char *a, const char *b)
+{
+  assert(a != nullptr);
+  assert(b != nullptr);
+
+  /* note: strcasecmp() depends on the locale, but for ASCII-only
+     strings, it's safe to use */
+  return strcasecmp(a, b) == 0;
+}
+
+#endif
diff --git a/src/util/StringUtil.cxx b/src/util/StringUtil.cxx
index 048f009f5..7e295bf90 100644
--- a/src/util/StringUtil.cxx
+++ b/src/util/StringUtil.cxx
@@ -19,8 +19,7 @@
 
 #include "StringUtil.hxx"
 #include "CharUtil.hxx"
-
-#include <glib.h>
+#include "ASCII.hxx"
 
 #include <assert.h>
 
@@ -40,7 +39,7 @@ string_array_contains(const char *const* haystack, const char *needle)
 	assert(needle != nullptr);
 
 	for (; *haystack != nullptr; ++haystack)
-		if (g_ascii_strcasecmp(*haystack, needle) == 0)
+		if (StringEqualsCaseASCII(*haystack, needle))
 			return true;
 
 	return false;