This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.18-39-g3a30923
- From: siddhesh at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 28 Aug 2013 04:14:22 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.18-39-g3a30923
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 3a3092398356c90788479fa75524a491e9d860cd (commit)
from 3b813b29653a3ebfd78c2529127a9967d8f2857d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=3a3092398356c90788479fa75524a491e9d860cd
commit 3a3092398356c90788479fa75524a491e9d860cd
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Wed Aug 28 09:44:19 2013 +0530
Use __glibc_unlikely instead of __builtin_expect (..., 0)
diff --git a/ChangeLog b/ChangeLog
index 6e418e7..06ecaab 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 dceb4d6..fd55852 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 7bb3ded..52177e4 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;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
nscd/aicache.c | 2 +-
sysdeps/posix/getaddrinfo.c | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources