Add missing braces to bsearch inline implementation [BZ #28400]
authorFlorian Weimer <fweimer@redhat.com>
Thu, 30 Sep 2021 16:44:06 +0000 (18:44 +0200)
committerFlorian Weimer <fweimer@redhat.com>
Thu, 30 Sep 2021 18:40:12 +0000 (20:40 +0200)
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>
bits/stdlib-bsearch.h

index d688ed2..e2fcea6 100644 (file)
@@ -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;