diff options
Diffstat (limited to 'string')
| -rw-r--r-- | string/memmem.c | 2 | ||||
| -rw-r--r-- | string/strerror.c | 2 | ||||
| -rw-r--r-- | string/strnlen.c | 2 | ||||
| -rw-r--r-- | string/test-memmem.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/string/memmem.c b/string/memmem.c index 93e5e18c66..b2842fe57f 100644 --- a/string/memmem.c +++ b/string/memmem.c @@ -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 diff --git a/string/strerror.c b/string/strerror.c index 5eed633e2b..3d732a2d28 100644 --- a/string/strerror.c +++ b/string/strerror.c @@ -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) diff --git a/string/strnlen.c b/string/strnlen.c index 8d53afbaf0..b3ab7ae44a 100644 --- a/string/strnlen.c +++ b/string/strnlen.c @@ -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. diff --git a/string/test-memmem.c b/string/test-memmem.c index 1b4e4b7ea0..caaa191d28 100644 --- a/string/test-memmem.c +++ b/string/test-memmem.c @@ -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) |