merge from gcc

This commit is contained in:
DJ Delorie 2001-09-25 23:02:03 +00:00
parent e62de969f0
commit 66c94e19fc
2 changed files with 6 additions and 3 deletions

View File

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

View File

@ -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;
}