diff options
author | Ondřej Bílka <neleai@seznam.cz> | 2014-02-10 14:45:42 +0100 |
---|---|---|
committer | Ondřej Bílka <neleai@seznam.cz> | 2014-02-10 15:07:12 +0100 |
commit | a1ffb40e32741f992c743e7b16c061fefa3747ac (patch) | |
tree | 246a29a87b26cfd5d07b17070f85eb3785018de9 /debug/strncat_chk.c | |
parent | 1448f3244714a9dabb5240ec18b094f100887d5c (diff) | |
download | glibc-a1ffb40e32741f992c743e7b16c061fefa3747ac.zip glibc-a1ffb40e32741f992c743e7b16c061fefa3747ac.tar.gz glibc-a1ffb40e32741f992c743e7b16c061fefa3747ac.tar.bz2 |
Use glibc_likely instead __builtin_expect.
Diffstat (limited to 'debug/strncat_chk.c')
-rw-r--r-- | debug/strncat_chk.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/debug/strncat_chk.c b/debug/strncat_chk.c index 955fc83..ff8b33f 100644 --- a/debug/strncat_chk.c +++ b/debug/strncat_chk.c @@ -33,7 +33,7 @@ __strncat_chk (s1, s2, n, s1len) /* Find the end of S1. */ do { - if (__builtin_expect (s1len-- == 0, 0)) + if (__glibc_unlikely (s1len-- == 0)) __chk_fail (); c = *s1++; } @@ -49,25 +49,25 @@ __strncat_chk (s1, s2, n, s1len) size_t n4 = n >> 2; do { - if (__builtin_expect (s1len-- == 0, 0)) + if (__glibc_unlikely (s1len-- == 0)) __chk_fail (); c = *s2++; *++s1 = c; if (c == '\0') return s; - if (__builtin_expect (s1len-- == 0, 0)) + if (__glibc_unlikely (s1len-- == 0)) __chk_fail (); c = *s2++; *++s1 = c; if (c == '\0') return s; - if (__builtin_expect (s1len-- == 0, 0)) + if (__glibc_unlikely (s1len-- == 0)) __chk_fail (); c = *s2++; *++s1 = c; if (c == '\0') return s; - if (__builtin_expect (s1len-- == 0, 0)) + if (__glibc_unlikely (s1len-- == 0)) __chk_fail (); c = *s2++; *++s1 = c; @@ -79,7 +79,7 @@ __strncat_chk (s1, s2, n, s1len) while (n > 0) { - if (__builtin_expect (s1len-- == 0, 0)) + if (__glibc_unlikely (s1len-- == 0)) __chk_fail (); c = *s2++; *++s1 = c; @@ -90,7 +90,7 @@ __strncat_chk (s1, s2, n, s1len) if (c != '\0') { - if (__builtin_expect (s1len-- == 0, 0)) + if (__glibc_unlikely (s1len-- == 0)) __chk_fail (); *++s1 = '\0'; } |