From: dj <dj>
Date: Fri, 24 Mar 2006 23:02:57 +0000 (+0000)
Subject: merge from gcc
X-Git-Tag: pre-ptymaster-archetype~827
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=136c51b17a1b3d6bc0188cde4d59698abec38212;p=pf3gnuchains%2Fpf3gnuchains4x.git

merge from gcc
---

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 68f6f38592..5007a178e9 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-24  Jim Blandy  <jimb@codesourcery.com>
+
+	* pex-common.c (pex_run): Simplify output name handling.
+
 2006-03-12  Jim Blandy  <jimb@red-bean.com>
 
 	* pex-common.h (struct pex_obj): Doc fixes.
diff --git a/libiberty/pex-common.c b/libiberty/pex-common.c
index b2ca6e08ce..db842aed24 100644
--- a/libiberty/pex-common.c
+++ b/libiberty/pex-common.c
@@ -211,17 +211,10 @@ pex_run (struct pex_obj *obj, int flags, const char *executable,
 	  outname_allocated = 0;
 	}
 
-      if (!outname_allocated)
-	{
-	  obj->next_input_name = outname;
-	  obj->next_input_name_allocated = 0;
-	}
-      else
-	{
-	  obj->next_input_name = outname;
-	  outname_allocated = 0;
-	  obj->next_input_name_allocated = 1;
-	}
+      /* Hand off ownership of outname to the next stage.  */
+      obj->next_input_name = outname;
+      obj->next_input_name_allocated = outname_allocated;
+      outname_allocated = 0;
     }
   else
     {