[commits] r1008 - in /fsf/trunk/libc: ChangeLog posix/wordexp.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sun Dec 24 00:01:31 2006
New Revision: 1008

Log:
Import glibc-mainline for 2006-12-24

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/posix/wordexp.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sun Dec 24 00:01:31 2006
@@ -1,3 +1,7 @@
+2006-12-23  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* posix/wordexp.c: Remove some unnecessary tests.
+
 2006-12-22  Gavin Romig-Koch  <gavin@xxxxxxxxxx>
 
 	* nis/nss_compat/compat-grp.c (internal_getgrgid_r): Don't

Modified: fsf/trunk/libc/posix/wordexp.c
==============================================================================
--- fsf/trunk/libc/posix/wordexp.c (original)
+++ fsf/trunk/libc/posix/wordexp.c Sun Dec 24 00:01:31 2006
@@ -1809,7 +1809,7 @@
 	    /* Substitute parameter */
 	    break;
 
-	  if (free_value && value)
+	  if (free_value)
 	    free (value);
 
 	  if (!colon_seen && value)
@@ -1827,7 +1827,7 @@
 	case ACT_NONNULL_SUBST:
 	  if (value && (*value || !colon_seen))
 	    {
-	      if (free_value && value)
+	      if (free_value)
 		free (value);
 
 	      value = pattern ? __strdup (pattern) : pattern;