From 53f40448901ffe0d953c81939d031c63cdf3779a Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 26 Dec 2014 13:40:17 +0100
Subject: util/{ASCII,UriUtil}, ...: work around -Wtautological-pointer-compare
New in clang 3.6.
---
src/util/ASCII.hxx | 6 ++++++
src/util/UriUtil.cxx | 3 +++
2 files changed, 9 insertions(+)
(limited to 'src/util')
diff --git a/src/util/ASCII.hxx b/src/util/ASCII.hxx
index cd26d9dec..9f7147338 100644
--- a/src/util/ASCII.hxx
+++ b/src/util/ASCII.hxx
@@ -43,8 +43,11 @@ gcc_pure gcc_nonnull_all
static inline bool
StringEqualsCaseASCII(const char *a, const char *b)
{
+#if !CLANG_CHECK_VERSION(3,6)
+ /* disabled on clang due to -Wtautological-pointer-compare */
assert(a != nullptr);
assert(b != nullptr);
+#endif
/* note: strcasecmp() depends on the locale, but for ASCII-only
strings, it's safe to use */
@@ -55,8 +58,11 @@ gcc_pure gcc_nonnull_all
static inline bool
StringEqualsCaseASCII(const char *a, const char *b, size_t n)
{
+#if !CLANG_CHECK_VERSION(3,6)
+ /* disabled on clang due to -Wtautological-pointer-compare */
assert(a != nullptr);
assert(b != nullptr);
+#endif
/* note: strcasecmp() depends on the locale, but for ASCII-only
strings, it's safe to use */
diff --git a/src/util/UriUtil.cxx b/src/util/UriUtil.cxx
index 1783fbca5..6dd5a42e1 100644
--- a/src/util/UriUtil.cxx
+++ b/src/util/UriUtil.cxx
@@ -128,8 +128,11 @@ uri_remove_auth(const char *uri)
bool
uri_is_child(const char *parent, const char *child)
{
+#if !CLANG_CHECK_VERSION(3,6)
+ /* disabled on clang due to -Wtautological-pointer-compare */
assert(parent != nullptr);
assert(child != nullptr);
+#endif
const size_t parent_length = strlen(parent);
return memcmp(parent, child, parent_length) == 0 &&
--
cgit v1.2.3