1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00

Use glibc_likely instead __builtin_expect.

This commit is contained in:
Ondřej Bílka
2014-02-10 14:45:42 +01:00
parent 1448f32447
commit a1ffb40e32
466 changed files with 2224 additions and 1655 deletions

View File

@ -53,7 +53,7 @@ memmem (const void *haystack_start, size_t haystack_len,
/* Sanity check, otherwise the loop might search through the whole
memory. */
if (__builtin_expect (haystack_len < needle_len, 0))
if (__glibc_unlikely (haystack_len < needle_len))
return NULL;
/* Use optimizations in memchr when possible, to reduce the search

View File

@ -32,7 +32,7 @@ strerror (errnum)
char *ret = __strerror_r (errnum, NULL, 0);
int saved_errno;
if (__builtin_expect (ret != NULL, 1))
if (__glibc_likely (ret != NULL))
return ret;
saved_errno = errno;
if (buf == NULL)

View File

@ -40,7 +40,7 @@ __strnlen (const char *str, size_t maxlen)
if (maxlen == 0)
return 0;
if (__builtin_expect (end_ptr < str, 0))
if (__glibc_unlikely (end_ptr < str))
end_ptr = (const char *) ~0UL;
/* Handle the first few characters by reading one character at a time.

View File

@ -44,7 +44,7 @@ simple_memmem (const void *haystack, size_t haystack_len, const void *needle,
/* Sanity check, otherwise the loop might search through the whole
memory. */
if (__builtin_expect (haystack_len < needle_len, 0))
if (__glibc_unlikely (haystack_len < needle_len))
return NULL;
for (begin = (const char *) haystack; begin <= last_possible; ++begin)