aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@redhat.com>2013-08-28 09:44:19 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2013-08-28 09:44:19 +0530
commit3a3092398356c90788479fa75524a491e9d860cd (patch)
tree83a0cd929d93b06ef5dfd8f6055f4c61f2ceaf9a
parent3b813b29653a3ebfd78c2529127a9967d8f2857d (diff)
downloadglibc-3a3092398356c90788479fa75524a491e9d860cd.tar
glibc-3a3092398356c90788479fa75524a491e9d860cd.tar.gz
glibc-3a3092398356c90788479fa75524a491e9d860cd.tar.bz2
glibc-3a3092398356c90788479fa75524a491e9d860cd.zip
Use __glibc_unlikely instead of __builtin_expect (..., 0)
-rw-r--r--ChangeLog5
-rw-r--r--nscd/aicache.c2
-rw-r--r--sysdeps/posix/getaddrinfo.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e418e7471..06ecaabcde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-28 Siddhesh Poyarekar <siddhesh@redhat.com>
+
+ * nscd/aicache.c (addhstaiX): Use __glibc_unlikely.
+ * sysdeps/posix/getaddrinfo.c (gaih_inet): Likewise.
+
2013-08-27 Mike Frysinger <vapier@gentoo.org>
[BZ #15897]
diff --git a/nscd/aicache.c b/nscd/aicache.c
index dceb4d679e..fd55852ed8 100644
--- a/nscd/aicache.c
+++ b/nscd/aicache.c
@@ -102,7 +102,7 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req,
"dns [!UNAVAIL=return] files", &nip);
/* Initialize configurations. */
- if (__builtin_expect (!_res_hconf.initialized, 0))
+ if (__glibc_unlikely (!_res_hconf.initialized))
_res_hconf_init ();
if (__res_maybe_init (&_res, 0) == -1)
no_more = 1;
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index 7bb3ded9af..52177e454c 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -802,7 +802,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
&nip);
/* Initialize configurations. */
- if (__builtin_expect (!_res_hconf.initialized, 0))
+ if (__glibc_unlikely (!_res_hconf.initialized))
_res_hconf_init ();
if (__res_maybe_init (&_res, 0) == -1)
no_more = 1;