merge from gcc

This commit is contained in:
DJ Delorie 2006-03-24 23:02:57 +00:00
parent 3de90d0ba4
commit 57b126a363
2 changed files with 8 additions and 11 deletions

View File

@ -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.

View File

@ -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
{