summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2013-08-23 05:59:48 (GMT)
committerdgp <dgp@users.sourceforge.net>2013-08-23 05:59:48 (GMT)
commitc3b526dd8620621345e9c5ff0f72234cff838715 (patch)
tree9cb887bb2a8767bca81474aee2ba9edae384d8c5
parentb3792d779d73852a163fd142bbb96acc46c98153 (diff)
downloadtcl-c3b526dd8620621345e9c5ff0f72234cff838715.zip
tcl-c3b526dd8620621345e9c5ff0f72234cff838715.tar.gz
tcl-c3b526dd8620621345e9c5ff0f72234cff838715.tar.bz2
Remove complications that no longer server any required purpose.
-rw-r--r--generic/tclBasic.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index fc449cc..4d56f3a 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -4095,8 +4095,6 @@ TclNREvalObjv(
Interp *iPtr = (Interp *) interp;
int result;
Namespace *lookupNsPtr = iPtr->lookupNsPtr;
- Command **cmdPtrPtr;
- NRE_callback *callbackPtr;
iPtr->lookupNsPtr = NULL;
@@ -4111,13 +4109,10 @@ TclNREvalObjv(
*/
if (iPtr->deferredCallbacks) {
- callbackPtr = iPtr->deferredCallbacks;
iPtr->deferredCallbacks = NULL;
} else {
TclNRAddCallback(interp, NRCommand, NULL, NULL, NULL, NULL);
- callbackPtr = TOP_CB(interp);
}
- cmdPtrPtr = (Command **) &(callbackPtr->data[0]);
iPtr->numLevels++;
result = TclInterpReady(interp);
@@ -4196,14 +4191,6 @@ TclNREvalObjv(
}
}
- /*
- * Fix the original callback to point to the now known cmdPtr. Insure that
- * the Command struct lives until the command returns.
- */
-
- *cmdPtrPtr = cmdPtr;
- cmdPtr->refCount++;
-
TclNRAddCallback(interp, Dispatch,
cmdPtr->nreProc ? cmdPtr->nreProc : cmdPtr->objProc,
cmdPtr->objClientData, INT2PTR(objc), objv);
@@ -4297,13 +4284,8 @@ NRCommand(
int result)
{
Interp *iPtr = (Interp *) interp;
- Command *cmdPtr = data[0];
- /* int cmdStart = PTR2INT(data[1]); NOT USED HERE */
- if (cmdPtr) {
- TclCleanupCommandMacro(cmdPtr);
- }
- ((Interp *)interp)->numLevels--;
+ iPtr->numLevels--;
/*
* If there is a tailcall, schedule it