diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-05 14:12:48 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-05 14:12:48 (GMT) |
| commit | e9e3981faf0495befa4c2914d59af0bd994ac23c (patch) | |
| tree | bd184725efaa3f52ca380c7c46cc6c2bd81c3165 /generic | |
| parent | b41a44e3942c841677cdcf7cd46be77c5c27ab08 (diff) | |
| parent | 8dac135fc9c8efae2cc3113bc975ab871ff2271f (diff) | |
| download | tcl-e9e3981faf0495befa4c2914d59af0bd994ac23c.zip tcl-e9e3981faf0495befa4c2914d59af0bd994ac23c.tar.gz tcl-e9e3981faf0495befa4c2914d59af0bd994ac23c.tar.bz2 | |
merge core-8-6-branch
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclCmdAH.c | 2 | ||||
| -rw-r--r-- | generic/tclExecute.c | 2 | ||||
| -rw-r--r-- | generic/tclTest.c | 26 |
3 files changed, 15 insertions, 15 deletions
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c index 88cc17d..4c299f8 100644 --- a/generic/tclCmdAH.c +++ b/generic/tclCmdAH.c @@ -1597,7 +1597,7 @@ FileAttrIsOwnedCmd( Tcl_Obj *const objv[]) { #ifdef __CYGWIN__ -#define geteuid() (short)(geteuid)() +#define geteuid() (short)(geteuid)() #endif #if !defined(_WIN32) Tcl_StatBuf buf; diff --git a/generic/tclExecute.c b/generic/tclExecute.c index e539161..34d92d3 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -3173,7 +3173,7 @@ TEBCresume( Tcl_Obj *copyPtr = Tcl_NewListObj(objc - opnd + 1, NULL); Tcl_ListObjAppendElement(NULL, copyPtr, objPtr); - Tcl_ListObjReplace(NULL, copyPtr, LIST_MAX, 0, + Tcl_ListObjReplace(NULL, copyPtr, LIST_MAX, 0, objc - opnd, objv + opnd); Tcl_DecrRefCount(objPtr); objPtr = copyPtr; diff --git a/generic/tclTest.c b/generic/tclTest.c index 1e595d6..568dd01 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -7295,10 +7295,11 @@ InterpCmdResolver( int flags, Tcl_Command *rPtr) { - Interp *iPtr = (Interp *) interp; - CallFrame *varFramePtr = iPtr->varFramePtr; - Proc *procPtr = (varFramePtr->isProcCallFrame & FRAME_IS_PROC) ? varFramePtr->procPtr : NULL; - Namespace *callerNsPtr = varFramePtr->nsPtr; + Interp *iPtr = (Interp *) interp; + CallFrame *varFramePtr = iPtr->varFramePtr; + Proc *procPtr = (varFramePtr->isProcCallFrame & FRAME_IS_PROC) ? + varFramePtr->procPtr : NULL; + Namespace *callerNsPtr = varFramePtr->nsPtr; Tcl_Command resolvedCmdPtr = NULL; /* @@ -7376,7 +7377,6 @@ InterpCmdResolver( return TCL_OK; } } - return TCL_CONTINUE; } @@ -7508,16 +7508,16 @@ TestInterpResolverCmd( int idx; #define RESOLVER_KEY "testInterpResolver" - if (objc < 2 || objc >3) { - Tcl_WrongNumArgs(interp, 1, objv, "up|down ?interp?"); - return TCL_ERROR; + if ((objc < 2) || (objc > 3)) { + Tcl_WrongNumArgs(interp, 1, objv, "up|down ?interp?"); + return TCL_ERROR; } if (objc == 3) { - interp = Tcl_GetSlave(interp, Tcl_GetString(objv[2])); - if (interp == NULL) { - Tcl_AppendResult(interp, "provided interpreter not found", NULL); - return TCL_ERROR; - } + interp = Tcl_GetSlave(interp, Tcl_GetString(objv[2])); + if (interp == NULL) { + Tcl_AppendResult(interp, "provided interpreter not found", NULL); + return TCL_ERROR; + } } if (Tcl_GetIndexFromObj(interp, objv[1], table, "operation", TCL_EXACT, &idx) != TCL_OK) { |