From 66c94e19fcc26fe6df70610769923f990ad9f187 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Tue, 25 Sep 2001 23:02:03 +0000 Subject: [PATCH] merge from gcc --- libiberty/ChangeLog | 4 ++++ libiberty/concat.c | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 22bf58cfad8..13bdd39d96f 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2001-09-25 Kaveh R. Ghazi + + * concat.c (reconcat): Fix for traditional C. + 2001-09-24 Kaveh R. Ghazi * concat.c (reconcat): New function. diff --git a/libiberty/concat.c b/libiberty/concat.c index 136e8be866e..cf026cf8f4c 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; } -- 2.30.2