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 /catgets/open_catalog.c | |
| parent | 1448f3244714a9dabb5240ec18b094f100887d5c (diff) | |
| download | glibc-a1ffb40e32741f992c743e7b16c061fefa3747ac.tar.gz | |
Use glibc_likely instead __builtin_expect.
Diffstat (limited to 'catgets/open_catalog.c')
| -rw-r--r-- | catgets/open_catalog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/catgets/open_catalog.c b/catgets/open_catalog.c index bc44f98247..d582270601 100644 --- a/catgets/open_catalog.c +++ b/catgets/open_catalog.c @@ -54,7 +54,7 @@ __open_catalog (const char *cat_name, const char *nlspath, const char *env_var, { const char *run_nlspath = nlspath; #define ENOUGH(n) \ - if (__builtin_expect (bufact + (n) >= bufmax, 0)) \ + if (__glibc_unlikely (bufact + (n) >= bufmax)) \ { \ char *old_buf = buf; \ bufmax += 256 + (n); \ @@ -253,7 +253,7 @@ __open_catalog (const char *cat_name, const char *nlspath, const char *env_var, /* Determine whether the file is a catalog file and if yes whether it is written using the correct byte order. Else we have to swap the values. */ - if (__builtin_expect (catalog->file_ptr->magic == CATGETS_MAGIC, 1)) + if (__glibc_likely (catalog->file_ptr->magic == CATGETS_MAGIC)) swapping = 0; else if (catalog->file_ptr->magic == SWAPU32 (CATGETS_MAGIC)) swapping = 1; |