aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-09-30 18:44:06 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-09-30 20:40:12 +0200
commit32b96d0dec0294465d2221a8f049703599d9d8e4 (patch)
treeb0503598aa040b51887b67675f64d30df889c52e
parentbeca615c5e6b5b6aeeac11f03a59b79d85b21cce (diff)
downloadglibc-32b96d0dec0294465d2221a8f049703599d9d8e4.zip
glibc-32b96d0dec0294465d2221a8f049703599d9d8e4.tar.gz
glibc-32b96d0dec0294465d2221a8f049703599d9d8e4.tar.bz2
Add missing braces to bsearch inline implementation [BZ #28400]
GCC treats the pragma as a statement, so that the else branch only consists of the pragma, not the return statement. Fixes commit a725ff1de965f4cc4f36a7e8ae795d40ca0350d7 ("Suppress -Wcast-qual warnings in bsearch"). Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
-rw-r--r--bits/stdlib-bsearch.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/bits/stdlib-bsearch.h b/bits/stdlib-bsearch.h
index d688ed2..e2fcea6 100644
--- a/bits/stdlib-bsearch.h
+++ b/bits/stdlib-bsearch.h
@@ -36,14 +36,16 @@ bsearch (const void *__key, const void *__base, size_t __nmemb, size_t __size,
else if (__comparison > 0)
__l = __idx + 1;
else
+ {
#if __GNUC_PREREQ(4, 6)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wcast-qual"
#endif
- return (void *) __p;
+ return (void *) __p;
#if __GNUC_PREREQ(4, 6)
# pragma GCC diagnostic pop
#endif
+ }
}
return NULL;