diff options
| author | Max Kellermann <max@duempel.org> | 2014-12-26 14:40:32 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-12-26 14:40:32 +0100 |
| commit | 412bedb697c66c809652510951e1ccdb5319d0bb (patch) | |
| tree | a9c94234d7078e7a1e694e65db70a65966ccb5ac /src/util | |
| parent | d37811f177bb7e4c5dd6e3a18b3466ba831aa379 (diff) | |
| parent | 163597ef6939e4250afafe12f821aa732b1fc2b7 (diff) | |
| download | mpd-412bedb697c66c809652510951e1ccdb5319d0bb.tar.gz mpd-412bedb697c66c809652510951e1ccdb5319d0bb.tar.xz mpd-412bedb697c66c809652510951e1ccdb5319d0bb.zip | |
Merge branch 'v0.19.x'
Diffstat (limited to '')
| -rw-r--r-- | src/util/ASCII.hxx | 26 | ||||
| -rw-r--r-- | src/util/UriUtil.cxx | 3 |
2 files changed, 19 insertions, 10 deletions
diff --git a/src/util/ASCII.hxx b/src/util/ASCII.hxx index 19a18a1bb..9f7147338 100644 --- a/src/util/ASCII.hxx +++ b/src/util/ASCII.hxx @@ -43,24 +43,30 @@ gcc_pure gcc_nonnull_all static inline bool StringEqualsCaseASCII(const char *a, const char *b) { - assert(a != nullptr); - assert(b != nullptr); +#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 */ - return strcasecmp(a, b) == 0; + /* note: strcasecmp() depends on the locale, but for ASCII-only + strings, it's safe to use */ + return strcasecmp(a, b) == 0; } gcc_pure gcc_nonnull_all static inline bool StringEqualsCaseASCII(const char *a, const char *b, size_t n) { - assert(a != nullptr); - assert(b != nullptr); +#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 */ - return strncasecmp(a, b, n) == 0; + /* note: strcasecmp() depends on the locale, but for ASCII-only + strings, it's safe to use */ + return strncasecmp(a, b, n) == 0; } #endif diff --git a/src/util/UriUtil.cxx b/src/util/UriUtil.cxx index 62977e91b..54d0ded77 100644 --- a/src/util/UriUtil.cxx +++ b/src/util/UriUtil.cxx @@ -140,8 +140,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 && |