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 /nscd/nscd_gethst_r.c | |
| parent | 1448f3244714a9dabb5240ec18b094f100887d5c (diff) | |
Use glibc_likely instead __builtin_expect.
Diffstat (limited to 'nscd/nscd_gethst_r.c')
| -rw-r--r-- | nscd/nscd_gethst_r.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nscd/nscd_gethst_r.c b/nscd/nscd_gethst_r.c index 3368fc4482..fe885ee320 100644 --- a/nscd/nscd_gethst_r.c +++ b/nscd/nscd_gethst_r.c @@ -140,7 +140,7 @@ nscd_gethst_r (const char *key, size_t keylen, request_type type, struct hostent *resultbuf, char *buffer, size_t buflen, struct hostent **result, int *h_errnop) { - if (__builtin_expect (__nss_have_localdomain >= 0, 0)) + if (__glibc_unlikely (__nss_have_localdomain >= 0)) { if (__nss_have_localdomain == 0) __nss_have_localdomain = getenv ("LOCALDOMAIN") != NULL ? 1 : -1; @@ -232,7 +232,7 @@ nscd_gethst_r (const char *key, size_t keylen, request_type type, /* No value found so far. */ *result = NULL; - if (__builtin_expect (hst_resp.found == -1, 0)) + if (__glibc_unlikely (hst_resp.found == -1)) { /* The daemon does not cache this database. */ __nss_not_use_nscd_hosts = 1; @@ -377,7 +377,7 @@ nscd_gethst_r (const char *key, size_t keylen, request_type type, goto out_close; } /* See whether this would exceed the buffer capacity. */ - if (__builtin_expect (cp > buffer + buflen, 0)) + if (__glibc_unlikely (cp > buffer + buflen)) { /* aliases_len array might contain garbage during nscd GC cycle, retry rather than fail in that case. */ |