From 705b3c6b63bd41f1eefe27c8d5291e3897026238 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 26 Dec 2014 13:37:38 +0100
Subject: util/ASCII: fix indent
---
src/util/ASCII.hxx | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
(limited to 'src/util/ASCII.hxx')
diff --git a/src/util/ASCII.hxx b/src/util/ASCII.hxx
index 19a18a1bb..cd26d9dec 100644
--- a/src/util/ASCII.hxx
+++ b/src/util/ASCII.hxx
@@ -43,24 +43,24 @@ gcc_pure gcc_nonnull_all
static inline bool
StringEqualsCaseASCII(const char *a, const char *b)
{
- assert(a != nullptr);
- assert(b != nullptr);
+ 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;
+ /* 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);
+ assert(a != nullptr);
+ assert(b != nullptr);
- /* 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
--
cgit v1.2.3
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 ++++++
1 file changed, 6 insertions(+)
(limited to 'src/util/ASCII.hxx')
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 */
--
cgit v1.2.3