diff options
| author | sebres <sebres@users.sourceforge.net> | 2017-03-06 20:18:35 (GMT) |
|---|---|---|
| committer | sebres <sebres@users.sourceforge.net> | 2017-03-06 20:18:35 (GMT) |
| commit | 9f13ce8038e4c27cab5d0ee977a61ca48bde2b73 (patch) | |
| tree | 2c581478c211e56c314bcaaeef4a690e7da31ed7 /generic/tclBasic.c | |
| parent | c88fb138612db4499a9e841453cd14bfd5db7224 (diff) | |
| parent | ae0c48521551ffe6af28967e0c3b848836fb632e (diff) | |
| download | tcl-9f13ce8038e4c27cab5d0ee977a61ca48bde2b73.zip tcl-9f13ce8038e4c27cab5d0ee977a61ca48bde2b73.tar.gz tcl-9f13ce8038e4c27cab5d0ee977a61ca48bde2b73.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclBasic.c')
| -rw-r--r-- | generic/tclBasic.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index dec26b4..cd7bd73 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -203,7 +203,7 @@ static const CmdInfo builtInCmds[] = { {"append", Tcl_AppendObjCmd, TclCompileAppendCmd, NULL, CMD_IS_SAFE}, {"apply", Tcl_ApplyObjCmd, NULL, TclNRApplyObjCmd, CMD_IS_SAFE}, {"break", Tcl_BreakObjCmd, TclCompileBreakCmd, NULL, CMD_IS_SAFE}, -#ifndef EXCLUDE_OBSOLETE_COMMANDS +#ifndef TCL_NO_DEPRECATED {"case", Tcl_CaseObjCmd, NULL, NULL, CMD_IS_SAFE}, #endif {"catch", Tcl_CatchObjCmd, TclCompileCatchCmd, TclNRCatchObjCmd, CMD_IS_SAFE}, @@ -4706,7 +4706,7 @@ TEOV_RunEnterTraces( { Interp *iPtr = (Interp *) interp; Command *cmdPtr = *cmdPtrPtr; - int newEpoch, cmdEpoch = cmdPtr->cmdEpoch; + size_t newEpoch, cmdEpoch = cmdPtr->cmdEpoch; int length, traceCode = TCL_OK; const char *command = TclGetStringFromObj(commandPtr, &length); @@ -6056,7 +6056,7 @@ TclNREvalObjEx( TclNRAddCallback(interp, TEOEx_ListCallback, listPtr, eoFramePtr, objPtr, NULL); - ListObjGetElements(listPtr, objc, objv); + TclListObjGetElements(NULL, listPtr, &objc, &objv); return TclNREvalObjv(interp, objc, objv, flags, NULL); } @@ -6703,11 +6703,10 @@ Tcl_AppendObjToErrorInfo( * pertains. */ Tcl_Obj *objPtr) /* Message to record. */ { - int length; - const char *message = TclGetStringFromObj(objPtr, &length); + const char *message = TclGetString(objPtr); Tcl_IncrRefCount(objPtr); - Tcl_AddObjErrorInfo(interp, message, length); + Tcl_AddObjErrorInfo(interp, message, objPtr->length); Tcl_DecrRefCount(objPtr); } |