diff options
| author | dgp <dgp@users.sourceforge.net> | 2018-11-19 17:29:12 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2018-11-19 17:29:12 (GMT) |
| commit | cc6faa155b3ac525cab5b017159361b62c4a9c6a (patch) | |
| tree | 7fcee0f1e0eb5fa165d2af2f118b1cd52c6352f8 /generic/tclTimer.c | |
| parent | 274d86b2ec1d33d42ce059946338c6e6e1086ea8 (diff) | |
| parent | 1fae54c8c004d072d62e3d867ef4e66b238d0bcd (diff) | |
| download | tcl-cc6faa155b3ac525cab5b017159361b62c4a9c6a.zip tcl-cc6faa155b3ac525cab5b017159361b62c4a9c6a.tar.gz tcl-cc6faa155b3ac525cab5b017159361b62c4a9c6a.tar.bz2 | |
merge 8.7
Diffstat (limited to 'generic/tclTimer.c')
| -rw-r--r-- | generic/tclTimer.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/generic/tclTimer.c b/generic/tclTimer.c index 54854d0..ccfd179 100644 --- a/generic/tclTimer.c +++ b/generic/tclTimer.c @@ -789,7 +789,7 @@ Tcl_AfterObjCmd( AfterInfo *afterPtr; AfterAssocData *assocPtr; int length; - int index; + int index = -1; static const char *const afterSubCmds[] = { "cancel", "idle", "info", NULL }; @@ -818,12 +818,9 @@ Tcl_AfterObjCmd( * First lets see if the command was passed a number as the first argument. */ - if (objv[1]->typePtr == &tclIntType - || objv[1]->typePtr == &tclBignumType - || (Tcl_GetIndexFromObj(NULL, objv[1], afterSubCmds, "", 0, - &index) != TCL_OK)) { - index = -1; - if (Tcl_GetWideIntFromObj(NULL, objv[1], &ms) != TCL_OK) { + if (Tcl_GetWideIntFromObj(NULL, objv[1], &ms) != TCL_OK) { + if (Tcl_GetIndexFromObj(NULL, objv[1], afterSubCmds, "", 0, &index) + != TCL_OK) { const char *arg = Tcl_GetString(objv[1]); Tcl_SetObjResult(interp, Tcl_ObjPrintf( |