diff options
| author | DJ Delorie <dj@redhat.com> | 2001-09-25 23:02:03 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2001-09-25 23:02:03 +0000 |
| commit | 66c94e19fcc26fe6df70610769923f990ad9f187 (patch) | |
| tree | 5177d8e06e9744c84ff056531fd801f6dbe29576 | |
| parent | e62de969f096f87e79a62eca52968460dcf1226f (diff) | |
| download | gdb-66c94e19fcc26fe6df70610769923f990ad9f187.zip gdb-66c94e19fcc26fe6df70610769923f990ad9f187.tar.gz gdb-66c94e19fcc26fe6df70610769923f990ad9f187.tar.bz2 | |
merge from gcc
| -rw-r--r-- | libiberty/ChangeLog | 4 | ||||
| -rw-r--r-- | libiberty/concat.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 22bf58c..13bdd39 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2001-09-25 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * concat.c (reconcat): Fix for traditional C. + 2001-09-24 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * concat.c (reconcat): New function. diff --git a/libiberty/concat.c b/libiberty/concat.c index 136e8be..cf026cf 100644 --- a/libiberty/concat.c +++ b/libiberty/concat.c @@ -188,10 +188,9 @@ reconcat VPARAMS ((char *optr, const char *first, ...)) VA_FIXEDARG (args, char *, optr); VA_FIXEDARG (args, const char *, first); vconcat_copy (newstr, first, args); - VA_CLOSE (args); - - if (optr) + if (optr) /* Done before VA_CLOSE so optr stays in scope for K&R C. */ free (optr); + VA_CLOSE (args); return newstr; } |