Use glibc_likely instead __builtin_expect.

1 files changed, 21 insertions, 21 deletions

diff --git a/posix/glob.c b/posix/glob.c
index f1431088a2..aa4bb92f82 100644
--- a/posix/glob.c
+++ b/posix/glob.c
@@ -354,7 +354,7 @@ glob (pattern, flags, errfunc, pglob)
 	      /* It is an illegal expression.  */
 	    illegal_brace:
 #ifdef _LIBC
-	      if (__builtin_expect (!alloca_onealt, 0))
+	      if (__glibc_unlikely (!alloca_onealt))
 #endif
 		free (onealt);
 	      return glob (pattern, flags & ~GLOB_BRACE, errfunc, pglob);
@@ -404,7 +404,7 @@ glob (pattern, flags, errfunc, pglob)
 	      if (result && result != GLOB_NOMATCH)
 		{
 #ifdef _LIBC
-		  if (__builtin_expect (!alloca_onealt, 0))
+		  if (__glibc_unlikely (!alloca_onealt))
 #endif
 		    free (onealt);
 		  if (!(flags & GLOB_APPEND))
@@ -425,7 +425,7 @@ glob (pattern, flags, errfunc, pglob)
 	    }
 
 #ifdef _LIBC
-	  if (__builtin_expect (!alloca_onealt, 0))
+	  if (__glibc_unlikely (!alloca_onealt))
 #endif
 	    free (onealt);
 
@@ -488,7 +488,7 @@ glob (pattern, flags, errfunc, pglob)
 	}
       else
 	{
-	  if (__builtin_expect (pattern[0] == '\0', 0))
+	  if (__glibc_unlikely (pattern[0] == '\0'))
 	    {
 	      dirs.gl_pathv = NULL;
 	      goto no_matches;
@@ -671,7 +671,7 @@ glob (pattern, flags, errfunc, pglob)
 						2 * pwbuflen);
 			  if (newp == NULL)
 			    {
-			      if (__builtin_expect (malloc_pwtmpbuf, 0))
+			      if (__glibc_unlikely (malloc_pwtmpbuf))
 				free (pwtmpbuf);
 			      retval = GLOB_NOSPACE;
 			      goto out;
@@ -717,7 +717,7 @@ glob (pattern, flags, errfunc, pglob)
 	    {
 	      if (flags & GLOB_TILDE_CHECK)
 		{
-		  if (__builtin_expect (malloc_home_dir, 0))
+		  if (__glibc_unlikely (malloc_home_dir))
 		    free (home_dir);
 		  retval = GLOB_NOMATCH;
 		  goto out;
@@ -730,7 +730,7 @@ glob (pattern, flags, errfunc, pglob)
 	  /* Now construct the full directory.  */
 	  if (dirname[1] == '\0')
 	    {
-	      if (__builtin_expect (malloc_dirname, 0))
+	      if (__glibc_unlikely (malloc_dirname))
 		free (dirname);
 
 	      dirname = home_dir;
@@ -750,7 +750,7 @@ glob (pattern, flags, errfunc, pglob)
 		  newp = malloc (home_len + dirlen);
 		  if (newp == NULL)
 		    {
-		      if (__builtin_expect (malloc_home_dir, 0))
+		      if (__glibc_unlikely (malloc_home_dir))
 			free (home_dir);
 		      retval = GLOB_NOSPACE;
 		      goto out;
@@ -760,7 +760,7 @@ glob (pattern, flags, errfunc, pglob)
 	      mempcpy (mempcpy (newp, home_dir, home_len),
 		       &dirname[1], dirlen);
 
-	      if (__builtin_expect (malloc_dirname, 0))
+	      if (__glibc_unlikely (malloc_dirname))
 		free (dirname);
 
 	      dirname = newp;
@@ -859,7 +859,7 @@ glob (pattern, flags, errfunc, pglob)
 		if (pwtmpbuf == NULL)
 		  {
 		  nomem_getpw:
-		    if (__builtin_expect (malloc_user_name, 0))
+		    if (__glibc_unlikely (malloc_user_name))
 		      free (user_name);
 		    retval = GLOB_NOSPACE;
 		    goto out;
@@ -884,7 +884,7 @@ glob (pattern, flags, errfunc, pglob)
 					  2 * buflen);
 		    if (newp == NULL)
 		      {
-			if (__builtin_expect (malloc_pwtmpbuf, 0))
+			if (__glibc_unlikely (malloc_pwtmpbuf))
 			  free (pwtmpbuf);
 			goto nomem_getpw;
 		      }
@@ -897,7 +897,7 @@ glob (pattern, flags, errfunc, pglob)
 	    p = getpwnam (user_name);
 #  endif
 
-	    if (__builtin_expect (malloc_user_name, 0))
+	    if (__glibc_unlikely (malloc_user_name))
 	      free (user_name);
 
 	    /* If we found a home directory use this.  */
@@ -906,7 +906,7 @@ glob (pattern, flags, errfunc, pglob)
 		size_t home_len = strlen (p->pw_dir);
 		size_t rest_len = end_name == NULL ? 0 : strlen (end_name);
 
-		if (__builtin_expect (malloc_dirname, 0))
+		if (__glibc_unlikely (malloc_dirname))
 		  free (dirname);
 		malloc_dirname = 0;
 
@@ -918,7 +918,7 @@ glob (pattern, flags, errfunc, pglob)
 		    dirname = malloc (home_len + rest_len + 1);
 		    if (dirname == NULL)
 		      {
-			if (__builtin_expect (malloc_pwtmpbuf, 0))
+			if (__glibc_unlikely (malloc_pwtmpbuf))
 			  free (pwtmpbuf);
 			retval = GLOB_NOSPACE;
 			goto out;
@@ -931,12 +931,12 @@ glob (pattern, flags, errfunc, pglob)
 		dirlen = home_len + rest_len;
 		dirname_modified = 1;
 
-		if (__builtin_expect (malloc_pwtmpbuf, 0))
+		if (__glibc_unlikely (malloc_pwtmpbuf))
 		  free (pwtmpbuf);
 	      }
 	    else
 	      {
-		if (__builtin_expect (malloc_pwtmpbuf, 0))
+		if (__glibc_unlikely (malloc_pwtmpbuf))
 		  free (pwtmpbuf);
 
 		if (flags & GLOB_TILDE_CHECK)
@@ -1035,7 +1035,7 @@ glob (pattern, flags, errfunc, pglob)
 	    *(char *) &dirname[--dirlen] = '\0';
 	}
 
-      if (__builtin_expect ((flags & GLOB_ALTDIRFUNC) != 0, 0))
+      if (__glibc_unlikely ((flags & GLOB_ALTDIRFUNC) != 0))
 	{
 	  /* Use the alternative access functions also in the recursive
 	     call.  */
@@ -1253,7 +1253,7 @@ glob (pattern, flags, errfunc, pglob)
     }
 
  out:
-  if (__builtin_expect (malloc_dirname, 0))
+  if (__glibc_unlikely (malloc_dirname))
     free (dirname);
 
   return retval;
@@ -1530,7 +1530,7 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
 	   of the function to copy this name into the result.  */
 	flags |= GLOB_NOCHECK;
 
-      if (__builtin_expect (!alloca_fullname, 0))
+      if (__glibc_unlikely (!alloca_fullname))
 	free (fullname);
     }
   else
@@ -1573,7 +1573,7 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
 		}
 	      d64buf;
 
-	      if (__builtin_expect (flags & GLOB_ALTDIRFUNC, 0))
+	      if (__glibc_unlikely (flags & GLOB_ALTDIRFUNC))
 		{
 		  struct dirent *d32 = (*pglob->gl_readdir) (stream);
 		  if (d32 != NULL)
@@ -1732,7 +1732,7 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
   if (stream != NULL)
     {
       save = errno;
-      if (__builtin_expect (flags & GLOB_ALTDIRFUNC, 0))
+      if (__glibc_unlikely (flags & GLOB_ALTDIRFUNC))
 	(*pglob->gl_closedir) (stream);
       else
 	closedir (stream);