merge core-8-6-branch

7 files changed, 29 insertions, 29 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) {
diff --git a/tests/resolver.test b/tests/resolver.test
index dc38ff0..9bb4c08 100644
--- a/tests/resolver.test
+++ b/tests/resolver.test
@@ -187,7 +187,7 @@ test resolver-2.1 {compiled var resolver: Bug #3383616} -setup {
     # During the compilation the compiled var resolver, the resolve-specific
     # var info is allocated, during the execution of the body, the variable is
     # fetched and cached.
-    x;
+    x
     # During later calls, the cached variable is reused.
     x
     # When the proc is freed, the resolver-specific resolver var info is
@@ -223,14 +223,14 @@ test resolver-3.1a {
 	proc y {} { return yy }
 	namespace eval ::ns {
 	    proc x1 {} { z }
-	}	
+	}
     }
 } -constraints testinterpresolver -body {
-    
+
     set r [i0 eval {namespace eval ::ctx1 {
 	::ns::x1
     }}]
-    
+
     return $r
 } -cleanup {
     testinterpresolver down i0
@@ -251,7 +251,7 @@ test resolver-3.1b {
 	proc Y {} { return YY }
 	namespace eval ::ns {
 	    proc x2 {} { z }
-	}	
+	}
     }
 } -constraints testinterpresolver -body {
 
@@ -274,7 +274,7 @@ test resolver-3.1c {
     interp command resolver,
     resolve literal "z" in proc "x1" in context "ctx1",
     resolve literal "z" in proc "x2" in context "ctx2"
-    
+
     Test, whether the shared cmd literal created by the first byte-code
     compilation interacts with the second one.
 } -setup {
@@ -288,7 +288,7 @@ test resolver-3.1c {
 	namespace eval ::ns {
 	    proc x1 {} { z }
 	    proc x2 {} { z }
-	}	
+	}
     }
 
 } -constraints testinterpresolver -body {
@@ -304,7 +304,7 @@ test resolver-3.1c {
     set r3 [i0 eval {namespace eval ::ctx1 {
 	::ns::x1
     }}]
-    
+
     return [list $r1 $r2 $r3]
 } -cleanup {
     testinterpresolver down i0
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 4d7500b..6662327 100755
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -3166,8 +3166,8 @@ TclWinFileOwned(
            case we are in all likelihood not the owner */
         return 0;
     }
-        
-    /* 
+
+    /*
      * Getting the current process SID is a multi-step process.
      * We make the assumption that if a call fails, this process is
      * so underprivileged it could not possibly own anything. Normally
@@ -3191,10 +3191,10 @@ TclWinFileOwned(
         LocalFree(secd);            /* Also frees ownerSid */
     if (buf)
         ckfree(buf);
-    
+
     return (owned != 0);        /* Convert non-0 to 1 */
 }
-    
+
 /*
  * Local Variables:
  * mode: c
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index 382addd..4666deb 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -1337,7 +1337,7 @@ ApplicationType(
 	Tcl_DStringFree(&ds);
 
 	ext = strrchr(fullName, '.');
-	if ((ext != NULL) && 
+	if ((ext != NULL) &&
             (strcasecmp(ext, ".cmd") == 0 || strcasecmp(ext, ".bat") == 0)) {
 	    applType = APPL_DOS;
 	    break;
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index b486466..159a708 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -360,7 +360,7 @@ typedef DWORD_PTR * PDWORD_PTR;
 #   define S_IFLNK        0120000  /* Symbolic Link */
 #endif
 
-/* 
+/*
  * Windows compilers do not define S_IFBLK. However, Tcl uses it in
  * GetTypeFromMode to identify blockSpecial devices based on the
  * value in the statsbuf st_mode field. We have no other way to pass this