diff options
| author | dgp <dgp@users.sourceforge.net> | 2018-03-10 15:45:00 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2018-03-10 15:45:00 (GMT) |
| commit | 6b5d0e5d8da204f9ab8165fafe0b497927a7fa24 (patch) | |
| tree | 1e0d150c87c6891a3591a0664d65b28bb26cd7a0 | |
| parent | 4dc5255a8e93af818fb7a984a9b8c715136d502b (diff) | |
| parent | d9dbcf5afb7f7261b5928092e17307280d737106 (diff) | |
| download | tcl-6b5d0e5d8da204f9ab8165fafe0b497927a7fa24.zip tcl-6b5d0e5d8da204f9ab8165fafe0b497927a7fa24.tar.gz tcl-6b5d0e5d8da204f9ab8165fafe0b497927a7fa24.tar.bz2 | |
merge 8.6
| -rw-r--r-- | generic/tclUtil.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/generic/tclUtil.c b/generic/tclUtil.c index 140c349..d1b81a9 100644 --- a/generic/tclUtil.c +++ b/generic/tclUtil.c @@ -107,8 +107,8 @@ static Tcl_ThreadDataKey precisionKey; static void ClearHash(Tcl_HashTable *tablePtr); static void FreeProcessGlobalValue(ClientData clientData); static void FreeThreadHash(ClientData clientData); -static int GetEndOffsetFromObj(Tcl_Interp *interp, - Tcl_Obj *objPtr, int endValue, int *indexPtr); +static int GetEndOffsetFromObj(Tcl_Obj *objPtr, int endValue, + int *indexPtr); static Tcl_HashTable * GetThreadHash(Tcl_ThreadDataKey *keyPtr); static int SetEndOffsetFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr); @@ -3584,7 +3584,7 @@ TclGetIntForIndex( return TCL_OK; } - if (GetEndOffsetFromObj(NULL, objPtr, endValue, indexPtr) == TCL_OK) { + if (GetEndOffsetFromObj(objPtr, endValue, indexPtr) == TCL_OK) { return TCL_OK; } @@ -3667,14 +3667,13 @@ TclGetIntForIndex( static int GetEndOffsetFromObj( - Tcl_Interp *interp, /* For error reporting, may be NULL. */ Tcl_Obj *objPtr, /* Pointer to the object to parse */ int endValue, /* The value to be stored at "indexPtr" if * "objPtr" holds "end". */ int *indexPtr) /* Location filled in with an integer * representing an index. */ { - if (SetEndOffsetFromAny(interp, objPtr) != TCL_OK) { + if (SetEndOffsetFromAny(NULL, objPtr) != TCL_OK) { return TCL_ERROR; } @@ -3864,7 +3863,7 @@ TclIndexEncode( idx = after; } /* usual case, the absolute index value encodes itself */ - } else if (TCL_OK == GetEndOffsetFromObj(NULL, objPtr, 0, &idx)) { + } else if (TCL_OK == GetEndOffsetFromObj(objPtr, 0, &idx)) { /* * We parsed an end+offset index value. * idx holds the offset value in the range INT_MIN...INT_MAX. |