diff options
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclBasic.c | 4 | ||||
| -rw-r--r-- | generic/tclCmdMZ.c | 22 |
2 files changed, 7 insertions, 19 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 3b757bb..6c73ed0 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -1131,7 +1131,7 @@ Tcl_CreateInterp(void) cmdPtr->cmdEpoch = 0; cmdPtr->compileProc = cmdInfoPtr->compileProc; cmdPtr->proc = NULL; - cmdPtr->clientData = cmdPtr; + cmdPtr->clientData = NULL; cmdPtr->objProc = cmdInfoPtr->objProc; cmdPtr->objClientData = NULL; cmdPtr->deleteProc = NULL; @@ -2946,7 +2946,7 @@ TclCreateObjCommandInNs( cmdPtr->objProc = proc; cmdPtr->objClientData = clientData; cmdPtr->proc = NULL; - cmdPtr->clientData = cmdPtr; + cmdPtr->clientData = NULL; cmdPtr->deleteProc = deleteProc; cmdPtr->deleteData = clientData; cmdPtr->flags = 0; diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c index 4ab0732..8b59e34 100644 --- a/generic/tclCmdMZ.c +++ b/generic/tclCmdMZ.c @@ -3339,31 +3339,19 @@ TclSubstOptions( static const char *const substOptions[] = { "-nobackslashes", "-nocommands", "-novariables", NULL }; - enum { - SUBST_NOBACKSLASHES, SUBST_NOCOMMANDS, SUBST_NOVARS + static const int optionFlags[] = { + TCL_SUBST_BACKSLASHES, TCL_SUBST_COMMANDS, TCL_SUBST_VARIABLES }; - int i, flags = TCL_SUBST_ALL; + int flags = TCL_SUBST_ALL; - for (i = 0; i < numOpts; i++) { + for (Tcl_Size i = 0; i < numOpts; i++) { int optionIndex; if (Tcl_GetIndexFromObj(interp, opts[i], substOptions, "option", 0, &optionIndex) != TCL_OK) { return TCL_ERROR; } - switch (optionIndex) { - case SUBST_NOBACKSLASHES: - flags &= ~TCL_SUBST_BACKSLASHES; - break; - case SUBST_NOCOMMANDS: - flags &= ~TCL_SUBST_COMMANDS; - break; - case SUBST_NOVARS: - flags &= ~TCL_SUBST_VARIABLES; - break; - default: - Tcl_Panic("Tcl_SubstObjCmd: bad option index to SubstOptions"); - } + flags &= ~optionFlags[optionIndex]; } *flagPtr = flags; return TCL_OK; |