diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-05-17 16:27:19 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-05-17 16:27:19 (GMT) |
| commit | 59f20f23bdf80b9aa0106269a64e16715a0deb2c (patch) | |
| tree | 1c09e78560216f9c0d9d708bca172ef4dd93cc6b /generic/tclInterp.c | |
| parent | c0d3b18e36ba15b38e066951ddf5adaf995be0d0 (diff) | |
| parent | 292c03d1c289ed9aae8eac6aba53c1857e4bf90d (diff) | |
| download | tcl-59f20f23bdf80b9aa0106269a64e16715a0deb2c.zip tcl-59f20f23bdf80b9aa0106269a64e16715a0deb2c.tar.gz tcl-59f20f23bdf80b9aa0106269a64e16715a0deb2c.tar.bz2 | |
Merge 9.0
Diffstat (limited to 'generic/tclInterp.c')
| -rw-r--r-- | generic/tclInterp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tclInterp.c b/generic/tclInterp.c index cfa6b7c..8f30128 100644 --- a/generic/tclInterp.c +++ b/generic/tclInterp.c @@ -789,7 +789,7 @@ NRInterpCmd( }; enum option { OPT_SAFE, OPT_LAST - }; + } idx; safe = Tcl_IsSafe(interp); @@ -802,10 +802,10 @@ NRInterpCmd( for (i = 2; i < objc; i++) { if ((last == 0) && (TclGetString(objv[i])[0] == '-')) { if (Tcl_GetIndexFromObj(interp, objv[i], createOptions, - "option", 0, &index) != TCL_OK) { + "option", 0, &idx) != TCL_OK) { return TCL_ERROR; } - if (index == OPT_SAFE) { + if (idx == OPT_SAFE) { safe = 1; continue; } @@ -2322,7 +2322,7 @@ GetInterp( Tcl_Interp *searchInterp; /* Interim storage for interp. to find. */ InterpInfo *parentInfoPtr; - if (TclListObjGetElements(interp, pathPtr, &objc, &objv) != TCL_OK) { + if (TclListObjGetElementsM(interp, pathPtr, &objc, &objv) != TCL_OK) { return NULL; } @@ -2378,7 +2378,7 @@ ChildBgerror( if (objc) { int length; - if (TCL_ERROR == TclListObjLength(NULL, objv[0], &length) + if (TCL_ERROR == TclListObjLengthM(NULL, objv[0], &length) || (length < 1)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "cmdPrefix must be list of length >= 1", -1)); @@ -2425,7 +2425,7 @@ ChildCreate( int isNew, objc; Tcl_Obj **objv; - if (TclListObjGetElements(interp, pathPtr, &objc, &objv) != TCL_OK) { + if (TclListObjGetElementsM(interp, pathPtr, &objc, &objv) != TCL_OK) { return NULL; } if (objc < 2) { |