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 | 56e6302ac87ce280352297bc5298e9bdc489f8bf (patch) | |
| tree | 0e80b328f9f9753b01bb7c9e60b9eb3d648a0476 | |
| parent | 3a03e0038d67182eadc6c402223c7c918f1f58fc (diff) | |
| download | gdb-56e6302ac87ce280352297bc5298e9bdc489f8bf.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 68f6f385923..5007a178e96 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 b2ca6e08ce2..db842aed243 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 { |