diff options
author | Max Kellermann <max@duempel.org> | 2014-12-26 14:26:31 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2014-12-26 14:28:52 +0100 |
commit | 940cab8620428f21e6d0c9f4b11893b1f44ce610 (patch) | |
tree | 9b4771f1fce4e0e95f1507f021aa7587b7ba366d /src/util/ASCII.hxx | |
parent | 5b84c99d793bf9b78cf28b462593775c32a3ce83 (diff) | |
parent | 665031467a55a32be306191514ac81f73ac41de7 (diff) | |
download | mpd-940cab8620428f21e6d0c9f4b11893b1f44ce610.tar.gz mpd-940cab8620428f21e6d0c9f4b11893b1f44ce610.tar.xz mpd-940cab8620428f21e6d0c9f4b11893b1f44ce610.zip |
Merge branch 'v0.18.x' into v0.19.x
Diffstat (limited to 'src/util/ASCII.hxx')
-rw-r--r-- | src/util/ASCII.hxx | 26 |
1 files changed, 16 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 |