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 /iconvdata/ibm1364.c | |
| parent | 1448f3244714a9dabb5240ec18b094f100887d5c (diff) | |
| download | glibc-a1ffb40e32741f992c743e7b16c061fefa3747ac.tar.gz | |
Use glibc_likely instead __builtin_expect.
Diffstat (limited to 'iconvdata/ibm1364.c')
| -rw-r--r-- | iconvdata/ibm1364.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/iconvdata/ibm1364.c b/iconvdata/ibm1364.c index 373d49a743..9de32c576a 100644 --- a/iconvdata/ibm1364.c +++ b/iconvdata/ibm1364.c @@ -77,7 +77,7 @@ { \ /* We are not in the initial state. To switch back we have \ to emit `SI'. */ \ - if (__builtin_expect (outbuf >= outend, 0)) \ + if (__glibc_unlikely (outbuf >= outend)) \ /* We don't have enough room in the output buffer. */ \ status = __GCONV_FULL_OUTPUT; \ else \ @@ -120,7 +120,7 @@ enum else \ { \ /* This is a combined character. Make sure we have room. */ \ - if (__builtin_expect (outptr + 8 > outend, 0)) \ + if (__glibc_unlikely (outptr + 8 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -204,7 +204,7 @@ enum { \ assert (curcs == db); \ \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ + if (__glibc_unlikely (inptr + 1 >= inend)) \ { \ /* The second character is not available. Store the \ intermediate result. */ \ @@ -274,7 +274,7 @@ enum curcs = db; \ } \ \ - if (__builtin_expect (outptr + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + 2 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -301,7 +301,7 @@ enum { \ uint32_t ch = get32 (inptr); \ \ - if (__builtin_expect (ch >= UCS_LIMIT, 0)) \ + if (__glibc_unlikely (ch >= UCS_LIMIT)) \ { \ UNICODE_TAG_HANDLER (ch, 4); \ \ @@ -353,7 +353,7 @@ enum curcs = db; \ } \ \ - if (__builtin_expect (outptr + 2 > outend, 0)) \ + if (__glibc_unlikely (outptr + 2 > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -364,13 +364,13 @@ enum } \ else \ { \ - if (__builtin_expect (curcs == db, 0)) \ + if (__glibc_unlikely (curcs == db)) \ { \ /* We know there is room for at least one byte. */ \ *outptr++ = SI; \ curcs = sb; \ \ - if (__builtin_expect (outptr >= outend, 0)) \ + if (__glibc_unlikely (outptr >= outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ |