diff options
author | DJ Delorie <dj@delorie.com> | 2006-03-24 23:02:57 +0000 |
---|---|---|
committer | DJ Delorie <dj@delorie.com> | 2006-03-24 23:02:57 +0000 |
commit | fa6a603699ffc3422f69b9f8ab155cba17aaf159 (patch) | |
tree | 01f311058ace9ebf8c0cdb252549f56fca2853b2 | |
parent | 6d652be6b85ef15d83a9c6c607f7b97581851f58 (diff) | |
download | binutils-redhat-fa6a603699ffc3422f69b9f8ab155cba17aaf159.tar.gz |
merge from gcc
-rw-r--r-- | libiberty/ChangeLog | 4 | ||||
-rw-r--r-- | libiberty/pex-common.c | 15 |
2 files changed, 8 insertions, 11 deletions
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 { |