diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | generic/tclBasic.c | 17 | ||||
| -rw-r--r-- | generic/tclParse.c | 2 | ||||
| -rw-r--r-- | generic/tclResult.c | 4 |
4 files changed, 28 insertions, 12 deletions
@@ -7,8 +7,21 @@ 2011-03-01 Miguel Sofer <msofer@users.sf.net> - * generic/tclCompCmdsSZ.c (TclCompileThrowCmd) - (TclCompileUnsetCmd): fix leaks + * generic/tclBasic.c (TclNREvalObjv): missing a variable + declaration in commented out non-optimised code, left for ref in + checkin [b97b771b6d] + +2011-03-03 Don Porter <dgp@users.sourceforge.net> + + * generic/tclResult.c (Tcl_AppendResultVA): Use the directive + USE_INTERP_RESULT [TIP 330] to force compat with interp->result + access, instead of the improvised hack USE_DIRECT_INTERP_RESULT_ACCESS + from releases past. + +2011-03-01 Miguel Sofer <msofer@users.sf.net> + + * generic/tclCompCmdsSZ.c (TclCompileThrowCmd, TclCompileUnsetCmd): + fix leaks * generic/tclBasic.c: This is [Patch 3168398], * generic/tclCompCmdsSZ.c: Joe Mistachkin's optimisation diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 30039a4..9187306 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -4263,14 +4263,17 @@ TclNREvalObjv( */ #if 0 - objProc = cmdPtr->nreProc; - if (!objProc) { - objProc = cmdPtr->objProc; + { + Tcl_ObjCmdProc *objProc = cmdPtr->nreProc; + + if (!objProc) { + objProc = cmdPtr->objProc; + } + + TclNRAddCallback(interp, NRRunObjProc, objProc, cmdPtr->objClientData, + INT2PTR(objc), (ClientData) objv); } - objClientData = cmdPtr->objClientData; - - TclNRAddCallback(interp, NRRunObjProc, objProc, objClientData, - INT2PTR(objc), (ClientData) objv); + return TCL_OK; #else if (cmdPtr->nreProc) { TclNRAddCallback(interp, NRRunObjProc, cmdPtr->nreProc, diff --git a/generic/tclParse.c b/generic/tclParse.c index c379260..48b1b88 100644 --- a/generic/tclParse.c +++ b/generic/tclParse.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ - + #include "tclInt.h" /* diff --git a/generic/tclResult.c b/generic/tclResult.c index 99942a9..f60ae26 100644 --- a/generic/tclResult.c +++ b/generic/tclResult.c @@ -648,14 +648,14 @@ Tcl_AppendResultVA( * calls to Tcl_GetStringResult() itself. [Patch 1041072 discussion] */ -#ifdef USE_DIRECT_INTERP_RESULT_ACCESS +#ifdef USE_INTERP_RESULT /* * Ensure that the interp->result is legal so old Tcl 7.* code still * works. There's still embarrasingly much of it about... */ (void) Tcl_GetStringResult(interp); -#endif /* USE_DIRECT_INTERP_RESULT_ACCESS */ +#endif /* USE_INTERP_RESULT */ } /* |