diff options
author | hobbs <hobbs@noemail.net> | 1999-10-21 02:16:21 (GMT) |
---|---|---|
committer | hobbs <hobbs@noemail.net> | 1999-10-21 02:16:21 (GMT) |
commit | a0b12781e90d48119e51c56f2a6d8267531c7535 (patch) | |
tree | 4f65ebbb53559917f7b5085067635040cae62b80 /generic/tclResult.c | |
parent | 1e0331a3079a5dd5e09f035e819dcedd49fc846f (diff) | |
download | tcl-a0b12781e90d48119e51c56f2a6d8267531c7535.zip tcl-a0b12781e90d48119e51c56f2a6d8267531c7535.tar.gz tcl-a0b12781e90d48119e51c56f2a6d8267531c7535.tar.bz2 |
* unix/tclUnixNotfy.c: fixed event/io threading problems by
making triggerPipe non-blocking
* library/tcltest1.0/tcltest.tcl:
* generic/tclThreadTest.c: fixed mem leaks in threads
* generic/tclResult.c: fixed Tcl_AppendResultVA so it only
iterates once over the va_list (avoiding a memcpy of it,
which is not portable).
* generic/regc_color.c: fixed mem leak and assertion, from HS
* generic/tclCompile.c: removed savedChar trick that appeared to
be causing a segv when the literal table was released
* tests/string.test:
* generic/tclCmdMZ.c: fixed [string index] to return ByteArrayObj
when indexing into one (test case string-5.16) [Bug: 2871]
FossilOrigin-Name: 1a3cca95e40ce5a3da207f356810b264e211a9c1
Diffstat (limited to 'generic/tclResult.c')
-rw-r--r-- | generic/tclResult.c | 57 |
1 files changed, 42 insertions, 15 deletions
diff --git a/generic/tclResult.c b/generic/tclResult.c index 2f18b51..663f47f 100644 --- a/generic/tclResult.c +++ b/generic/tclResult.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclResult.c,v 1.3 1999/05/07 20:07:35 stanton Exp $ + * RCS: @(#) $Id: tclResult.c,v 1.4 1999/10/21 02:16:22 hobbs Exp $ */ #include "tclInt.h" @@ -455,10 +455,12 @@ Tcl_AppendResultVA (interp, argList) * return value. */ va_list argList; /* Variable argument list. */ { +#define STATIC_LIST_SIZE 16 Interp *iPtr = (Interp *) interp; - va_list tmpArgList; - char *string; - int newSpace; + char *string, *static_list[STATIC_LIST_SIZE]; + char **args = static_list; + int nargs_space = STATIC_LIST_SIZE; + int nargs, newSpace, i; /* * If the string result is empty, move the object result to the @@ -472,17 +474,35 @@ Tcl_AppendResultVA (interp, argList) } /* - * Scan through all the arguments to see how much space is needed. + * Scan through all the arguments to see how much space is needed + * and save pointers to the arguments in the args array, + * reallocating as necessary. */ - memcpy ((VOID *) &tmpArgList, (VOID *) &argList, sizeof (tmpArgList)); + nargs = 0; newSpace = 0; while (1) { - string = va_arg(tmpArgList, char *); + string = va_arg(argList, char *); if (string == NULL) { break; } - newSpace += strlen(string); + if (nargs >= nargs_space) { + /* + * Expand the args buffer + */ + nargs_space += STATIC_LIST_SIZE; + if (args == static_list) { + args = (void *)ckalloc(nargs_space * sizeof(char *)); + for (i = 0; i < nargs; ++i) { + args[i] = static_list[i]; + } + } else { + args = (void *)ckrealloc((void *)args, + nargs_space * sizeof(char *)); + } + } + newSpace += strlen(string); + args[nargs++] = string; } /* @@ -501,14 +521,21 @@ Tcl_AppendResultVA (interp, argList) * buffer. */ - while (1) { - string = va_arg(argList, char *); - if (string == NULL) { - break; - } - strcpy(iPtr->appendResult + iPtr->appendUsed, string); - iPtr->appendUsed += strlen(string); + for (i = 0; i < nargs; ++i) { + string = args[i]; + strcpy(iPtr->appendResult + iPtr->appendUsed, string); + iPtr->appendUsed += strlen(string); + } + + /* + * If we had to allocate a buffer from the heap, + * free it now. + */ + + if (args != static_list) { + ckfree((void *)args); } +#undef STATIC_LIST_SIZE } /* |