summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-02 14:56:58 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-02 14:56:58 (GMT)
commit7e516346c64302d02f15bfadf29101685ca5f8e3 (patch)
tree8ed7ff0e8633b00c8a0614b9c1f903731edf8b0a /generic
parent30366b0dd201402a38d55013bfc43b5ed707a2e4 (diff)
parent23c8c8b5e43fffff7f81e26ffa820d4f51cca5c5 (diff)
downloadtcl-7e516346c64302d02f15bfadf29101685ca5f8e3.zip
tcl-7e516346c64302d02f15bfadf29101685ca5f8e3.tar.gz
tcl-7e516346c64302d02f15bfadf29101685ca5f8e3.tar.bz2
merge trunk
Diffstat (limited to 'generic')
-rw-r--r--generic/tclThreadTest.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/generic/tclThreadTest.c b/generic/tclThreadTest.c
index d642097..e718d34 100644
--- a/generic/tclThreadTest.c
+++ b/generic/tclThreadTest.c
@@ -61,8 +61,8 @@ static ThreadSpecificData *threadList = NULL;
* "thread create" Tcl command or the ThreadCreate() C function.
*/
-typedef struct {
- const char *script; /* The Tcl command this thread should
+typedef struct ThreadCtrl {
+ const char *script; /* The Tcl command this thread should
* execute */
int flags; /* Initial value of the "flags" field in the
* ThreadSpecificData structure for the new
@@ -229,8 +229,8 @@ ThreadObjCmd(
Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?");
return TCL_ERROR;
}
- if (Tcl_GetIndexFromObj(interp, objv[1], threadOptions, "option", 0,
- &option) != TCL_OK) {
+ if (Tcl_GetIndexFromObjStruct(interp, objv[1], threadOptions,
+ sizeof(char *), "option", 0, &option) != TCL_OK) {
return TCL_ERROR;
}
@@ -513,7 +513,6 @@ ThreadCreate(
TCL_THREAD_STACK_DEFAULT, joinable) != TCL_OK) {
Tcl_MutexUnlock(&threadMutex);
Tcl_AppendResult(interp, "can't create a new thread", NULL);
- ckfree(ctrl.script);
return TCL_ERROR;
}