diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-12-07 12:37:14 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-12-07 12:37:14 (GMT) |
| commit | 5dafe4ef8d8cdadb34bb45b7c3608c843bca623b (patch) | |
| tree | b34054e2d1c9a7f2e2ab2238d182984ec14ba933 /generic/tclThreadTest.c | |
| parent | 252431a635b7659d22579fcd187264884472c72f (diff) | |
| parent | 55328af8909d074b8715cb5c50453d0d6e0149e4 (diff) | |
| download | tcl-5dafe4ef8d8cdadb34bb45b7c3608c843bca623b.zip tcl-5dafe4ef8d8cdadb34bb45b7c3608c843bca623b.tar.gz tcl-5dafe4ef8d8cdadb34bb45b7c3608c843bca623b.tar.bz2 | |
merge core-8-5-branch.better_deprecation_85
eliminate more deprecated calls
Diffstat (limited to 'generic/tclThreadTest.c')
| -rw-r--r-- | generic/tclThreadTest.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/generic/tclThreadTest.c b/generic/tclThreadTest.c index 0482822..b4bb0e1 100644 --- a/generic/tclThreadTest.c +++ b/generic/tclThreadTest.c @@ -209,8 +209,8 @@ Tcl_ThreadObjCmd( Tcl_WrongNumArgs(interp, 1, objv, "option ?args?"); 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; } @@ -514,7 +514,7 @@ NewTestThread( */ Tcl_Preserve((ClientData) tsdPtr->interp); - result = Tcl_Eval(tsdPtr->interp, threadEvalScript); + result = Tcl_EvalEx(tsdPtr->interp, threadEvalScript, -1, 0); if (result != TCL_OK) { ThreadErrorProc(tsdPtr->interp); } @@ -557,7 +557,7 @@ ThreadErrorProc( char buf[TCL_DOUBLE_SPACE+1]; sprintf(buf, "%ld", (long) Tcl_GetCurrentThread()); - errorInfo = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY); + errorInfo = Tcl_GetVar2(interp, "errorInfo", NULL, TCL_GLOBAL_ONLY); if (errorProcString == NULL) { errChannel = Tcl_GetStdChannel(TCL_STDERR); Tcl_WriteChars(errChannel, "Error from thread ", -1); @@ -733,7 +733,7 @@ TclThreadSend( if (threadId == Tcl_GetCurrentThread()) { Tcl_MutexUnlock(&threadMutex); - return Tcl_GlobalEval(interp, script); + return Tcl_EvalEx(interp, script, -1, TCL_EVAL_GLOBAL); } /* @@ -872,12 +872,12 @@ ThreadEventProc( Tcl_ResetResult(interp); Tcl_CreateThreadExitHandler(ThreadFreeProc, (ClientData) threadEventPtr->script); - code = Tcl_GlobalEval(interp, threadEventPtr->script); + code = Tcl_EvalEx(interp, threadEventPtr->script, -1, TCL_EVAL_GLOBAL); Tcl_DeleteThreadExitHandler(ThreadFreeProc, (ClientData) threadEventPtr->script); if (code != TCL_OK) { - errorCode = Tcl_GetVar(interp, "errorCode", TCL_GLOBAL_ONLY); - errorInfo = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY); + errorCode = Tcl_GetVar2(interp, "errorCode", NULL, TCL_GLOBAL_ONLY); + errorInfo = Tcl_GetVar2(interp, "errorInfo", NULL, TCL_GLOBAL_ONLY); } else { errorCode = errorInfo = NULL; } |