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 /iconv/gconv_open.c | |
| parent | 1448f3244714a9dabb5240ec18b094f100887d5c (diff) | |
| download | glibc-a1ffb40e32741f992c743e7b16c061fefa3747ac.tar.gz glibc-a1ffb40e32741f992c743e7b16c061fefa3747ac.tar.xz glibc-a1ffb40e32741f992c743e7b16c061fefa3747ac.zip | |
Use glibc_likely instead __builtin_expect.
Diffstat (limited to 'iconv/gconv_open.c')
| -rw-r--r-- | iconv/gconv_open.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/iconv/gconv_open.c b/iconv/gconv_open.c index 69a1f65eb2..bfbe22bff6 100644 --- a/iconv/gconv_open.c +++ b/iconv/gconv_open.c @@ -45,7 +45,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle, errhand = strchr (toset, '/'); if (errhand != NULL) errhand = strchr (errhand + 1, '/'); - if (__builtin_expect (errhand != NULL, 1)) + if (__glibc_likely (errhand != NULL)) { if (*++errhand == '\0') errhand = NULL; @@ -318,7 +318,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle, struct __gconv_trans_data *curp = transp; transp = transp->__next; - if (__builtin_expect (curp->__trans_end_fct != NULL, 0)) + if (__glibc_unlikely (curp->__trans_end_fct != NULL)) curp->__trans_end_fct (curp->__data); free (curp); |