Use __glibc_unlikely instead of __builtin_expect (..., 0)

diff --git a/ChangeLog b/ChangeLog
index 6e418e74710adff8e065fd6387c9fd8c0c1323cd..06ecaabcdeedac38df59b1f899127fd7a840993e 100644 (file)
--- 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 dceb4d679e3e0296ef6d8fa4764a3aadfd75631f..fd55852ed85d7f7542a43047748bf8f4b421f09f 100644 (file)
--- 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 7bb3ded9af07ae2392633876c7009de2789bd3b6..52177e454c33bef130ed03b1e2da218799187edf 100644 (file)
--- 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;