Use glibc_likely instead __builtin_expect.

[thirdparty/glibc.git] / nis / nss_compat / compat-grp.c

diff --git a/nis/nss_compat/compat-grp.c b/nis/nss_compat/compat-grp.c
index 2d57461feda3c9e3956fa639749965a0c17bfc5c..78e14d6d3caf12e25ceda70767efc30cce9f2bc4 100644 (file)
--- a/nis/nss_compat/compat-grp.c
+++ b/nis/nss_compat/compat-grp.c
@@ -288,7 +288,7 @@ getgrent_next_file (struct group *result, ent_t *ent,
       do
        {
          /* We need at least 3 characters for one line.  */
-         if (__builtin_expect (buflen < 3, 0))
+         if (__glibc_unlikely (buflen < 3))
            {
            erange:
              *errnop = ERANGE;
@@ -321,7 +321,7 @@ getgrent_next_file (struct group *result, ent_t *ent,
             !(parse_res = _nss_files_parse_grent (p, result, data, buflen,
                                                   errnop)));
 
-      if (__builtin_expect (parse_res == -1, 0))
+      if (__glibc_unlikely (parse_res == -1))
        /* The parser ran out of space.  */
        goto erange_reset;
 
@@ -421,7 +421,7 @@ internal_getgrnam_r (const char *name, struct group *result, ent_t *ent,
       do
        {
          /* We need at least 3 characters for one line.  */
-         if (__builtin_expect (buflen < 3, 0))
+         if (__glibc_unlikely (buflen < 3))
            {
            erange:
              *errnop = ERANGE;
@@ -454,7 +454,7 @@ internal_getgrnam_r (const char *name, struct group *result, ent_t *ent,
             !(parse_res = _nss_files_parse_grent (p, result, data, buflen,
                                                   errnop)));
 
-      if (__builtin_expect (parse_res == -1, 0))
+      if (__glibc_unlikely (parse_res == -1))
        /* The parser ran out of space.  */
        goto erange_reset;
 
@@ -552,7 +552,7 @@ internal_getgrgid_r (gid_t gid, struct group *result, ent_t *ent,
       do
        {
          /* We need at least 3 characters for one line.  */
-         if (__builtin_expect (buflen < 3, 0))
+         if (__glibc_unlikely (buflen < 3))
            {
            erange:
              *errnop = ERANGE;
@@ -585,7 +585,7 @@ internal_getgrgid_r (gid_t gid, struct group *result, ent_t *ent,
             !(parse_res = _nss_files_parse_grent (p, result, data, buflen,
                                                   errnop)));
 
-      if (__builtin_expect (parse_res == -1, 0))
+      if (__glibc_unlikely (parse_res == -1))
        /* The parser ran out of space.  */
        goto erange_reset;