Mostly whitespace fixes, but also a bug in Tcl_SetWideUIntObj

33 files changed, 111 insertions, 129 deletions

diff --git a/generic/tclAsync.c b/generic/tclAsync.c
index dfed6ec..7a5b862 100644
--- a/generic/tclAsync.c
+++ b/generic/tclAsync.c
@@ -190,7 +190,7 @@ Tcl_AsyncCreate(
 
 void
 Tcl_AsyncMark(
-    Tcl_AsyncHandler async)		/* Token for handler. */
+    Tcl_AsyncHandler async)	/* Token for handler. */
 {
     AsyncHandler *token = (AsyncHandler *) async;
 
@@ -223,8 +223,8 @@ Tcl_AsyncMark(
 
 int
 Tcl_AsyncMarkFromSignal(
-    Tcl_AsyncHandler async,		/* Token for handler. */
-    int sigNumber)			/* Signal number. */
+    Tcl_AsyncHandler async,	/* Token for handler. */
+    int sigNumber)		/* Signal number. */
 {
 #if TCL_THREADS
     AsyncHandler *token = (AsyncHandler *) async;
@@ -377,7 +377,7 @@ Tcl_AsyncInvoke(
 
 void
 Tcl_AsyncDelete(
-    Tcl_AsyncHandler async)		/* Token for handler to delete. */
+    Tcl_AsyncHandler async)	/* Token for handler to delete. */
 {
     AsyncHandler *asyncPtr = (AsyncHandler *) async;
 
diff --git a/generic/tclClock.c b/generic/tclClock.c
index 0c37e6a..c3b87d8 100644
--- a/generic/tclClock.c
+++ b/generic/tclClock.c
@@ -4583,11 +4583,11 @@ ClockSafeCatchCmd(
     Tcl_Obj *const objv[])
 {
     typedef struct {
-	int status;			/* return code status */
-	int flags;			/* Each remaining field saves the */
-	int returnLevel;		/* corresponding field of the Interp */
-	int returnCode;			/* struct. These fields taken together are */
-	Tcl_Obj *errorInfo;		/* the "state" of the interp. */
+	int status;		/* return code status */
+	int flags;		/* Each remaining field saves the */
+	int returnLevel;	/* corresponding field of the Interp */
+	int returnCode;		/* struct. These fields taken together are */
+	Tcl_Obj *errorInfo;	/* the "state" of the interp. */
 	Tcl_Obj *errorCode;
 	Tcl_Obj *returnOpts;
 	Tcl_Obj *objResult;
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index a46f6d9..429daec 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -1259,7 +1259,7 @@ TclInfoFrame(
 {
     Interp *iPtr = (Interp *) interp;
     Tcl_Obj *tmpObj;
-    Tcl_Obj *lv[20] = {NULL};		/* Keep uptodate when more keys are added to
+    Tcl_Obj *lv[20] = {NULL};	/* Keep uptodate when more keys are added to
 				 * the dict. */
     int lc = 0;
     /*
@@ -2427,7 +2427,7 @@ int
 Tcl_LinsertObjCmd(
     TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,		/* Number of arguments. */
+    int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Tcl_Obj *listPtr;
@@ -2520,9 +2520,8 @@ int
 Tcl_ListObjCmd(
     TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,		/* Number of arguments. */
-    Tcl_Obj *const objv[])
-				/* The argument objects. */
+    int objc,			/* Number of arguments. */
+    Tcl_Obj *const objv[])	/* The argument objects. */
 {
     /*
      * If there are no list elements, the result is an empty object.
@@ -2557,8 +2556,7 @@ Tcl_LlengthObjCmd(
     TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
-    Tcl_Obj *const objv[])
-				/* Argument objects. */
+    Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Tcl_Size listLen;
     int result;
@@ -2606,8 +2604,7 @@ Tcl_LpopObjCmd(
     TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
-    Tcl_Obj *const objv[])
-				/* Argument objects. */
+    Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Tcl_Size listLen;
     int copied = 0, result;
@@ -2725,8 +2722,7 @@ Tcl_LrangeObjCmd(
     TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
-    Tcl_Obj *const objv[])
-				/* Argument objects. */
+    Tcl_Obj *const objv[])	/* Argument objects. */
 {
     int result;
     Tcl_Size listLen, first, last;
@@ -2937,9 +2933,8 @@ int
 Tcl_LrepeatObjCmd(
     TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,		/* Number of arguments. */
-    Tcl_Obj *const objv[])
-				/* The argument objects. */
+    int objc,			/* Number of arguments. */
+    Tcl_Obj *const objv[])	/* The argument objects. */
 {
     Tcl_WideInt elementCount, i;
     Tcl_Size totalElems;
@@ -5361,7 +5356,7 @@ DictionaryCompare(
     int secondaryDiff = 0;
 
     while (1) {
-		if (isdigit(UCHAR(*right))		/* INTL: digit */
+	if (isdigit(UCHAR(*right))		/* INTL: digit */
 		&& isdigit(UCHAR(*left))) {	/* INTL: digit */
 	    /*
 	     * There are decimal numbers embedded in the two strings. Compare
diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index 28e4247..0d80f5b 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -3346,7 +3346,7 @@ TclCompileFormatCmd(
     start = TclGetString(formatObj);
 				/* The start of the currently-scanned literal
 				 * in the format string. */
-    TclNewObj(tmpObj);	/* The buffer used to accumulate the literal
+    TclNewObj(tmpObj);		/* The buffer used to accumulate the literal
 				 * being built. */
     for (bytes = start ; *bytes ; bytes++) {
 	if (*bytes == '%') {
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 881c356..659d4fd 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -2639,7 +2639,7 @@ TclCompileCmdWord(
     Tcl_Interp *interp,		/* Used for error and status reporting. */
     Tcl_Token *tokenPtr,	/* Pointer to first in an array of tokens for
 				 * a command word to compile inline. */
-    size_t count1,			/* Number of tokens to consider at tokenPtr.
+    size_t count1,		/* Number of tokens to consider at tokenPtr.
 				 * Must be at least 1. */
     CompileEnv *envPtr)		/* Holds the resulting instructions. */
 {
diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c
index b1249e8..9c1734b 100644
--- a/generic/tclDictObj.c
+++ b/generic/tclDictObj.c
@@ -1265,7 +1265,7 @@ Tcl_DictObjNext(
 
 void
 Tcl_DictObjDone(
-    Tcl_DictSearch *searchPtr)		/* Pointer to a hash search context. */
+    Tcl_DictSearch *searchPtr)	/* Pointer to a hash search context. */
 {
     Dict *dict;
 
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 5842a0b..0f7a6c5 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -3057,7 +3057,7 @@ Utf16ToUtfProc(
 		if (PROFILE_STRICT(flags)) {
 		    result = TCL_CONVERT_SYNTAX;
 		    src -= 2;	/* Go back to beginning of high surrogate */
-		    dst--;		/* Also undo writing a single byte too much */
+		    dst--;	/* Also undo writing a single byte too much */
 		    break;
 		}
 		if (PROFILE_REPLACE(flags)) {
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 473e226..fced7d0 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -9560,7 +9560,7 @@ TclExprFloatError(
 
 int
 TclLog2(
-    int value)		/* The integer for which to compute the log
+    int value)			/* The integer for which to compute the log
 				 * base 2. */
 {
     int n = value;
diff --git a/generic/tclHash.c b/generic/tclHash.c
index 9bdb079..e093107 100644
--- a/generic/tclHash.c
+++ b/generic/tclHash.c
@@ -104,8 +104,7 @@ const Tcl_HashKeyType tclStringHashKeyType = {
 
 void
 Tcl_InitHashTable(
-    Tcl_HashTable *tablePtr,
-				/* Pointer to table record, which is supplied
+    Tcl_HashTable *tablePtr,	/* Pointer to table record, which is supplied
 				 * by the caller. */
     int keyType)		/* Type of keys to use in table:
 				 * TCL_STRING_KEYS, TCL_ONE_WORD_KEYS, or an
@@ -142,8 +141,7 @@ Tcl_InitHashTable(
 
 void
 Tcl_InitCustomHashTable(
-    Tcl_HashTable *tablePtr,
-				/* Pointer to table record, which is supplied
+    Tcl_HashTable *tablePtr,	/* Pointer to table record, which is supplied
 				 * by the caller. */
     int keyType,		/* Type of keys to use in table:
 				 * TCL_STRING_KEYS, TCL_ONE_WORD_KEYS,
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 77b9475..240fbbe 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -336,27 +336,27 @@ static void		FreeChannelInternalRep(Tcl_Obj *objPtr);
 
 static const Tcl_ObjType chanObjType = {
     "channel",			/* name for this type */
-    FreeChannelInternalRep,		/* freeIntRepProc */
-    DupChannelInternalRep,		/* dupIntRepProc */
+    FreeChannelInternalRep,	/* freeIntRepProc */
+    DupChannelInternalRep,	/* dupIntRepProc */
     NULL,			/* updateStringProc */
     NULL,			/* setFromAnyProc */
     TCL_OBJTYPE_V0
 };
 
-#define ChanSetInternalRep(objPtr, resPtr)					\
+#define ChanSetInternalRep(objPtr, resPtr) \
     do {								\
 	Tcl_ObjInternalRep ir;						\
 	(resPtr)->refCount++;						\
 	ir.twoPtrValue.ptr1 = (resPtr);					\
 	ir.twoPtrValue.ptr2 = NULL;					\
-	Tcl_StoreInternalRep((objPtr), &chanObjType, &ir);			\
+	Tcl_StoreInternalRep((objPtr), &chanObjType, &ir);		\
     } while (0)
 
-#define ChanGetInternalRep(objPtr, resPtr)					\
+#define ChanGetInternalRep(objPtr, resPtr) \
     do {								\
-	const Tcl_ObjInternalRep *irPtr;					\
+	const Tcl_ObjInternalRep *irPtr;				\
 	irPtr = TclFetchInternalRep((objPtr), &chanObjType);		\
-	(resPtr) = irPtr ? (ResolvedChanName *)irPtr->twoPtrValue.ptr1 : NULL;		\
+	(resPtr) = irPtr ? (ResolvedChanName *)irPtr->twoPtrValue.ptr1 : NULL; \
     } while (0)
 
 #define BUSY_STATE(st, fl) \
diff --git a/generic/tclLiteral.c b/generic/tclLiteral.c
index 83323ba..30b8c3b 100644
--- a/generic/tclLiteral.c
+++ b/generic/tclLiteral.c
@@ -58,8 +58,7 @@ static void		RebuildLiteralTable(LiteralTable *tablePtr);
 
 void
 TclInitLiteralTable(
-    LiteralTable *tablePtr)
-				/* Pointer to table structure, which is
+    LiteralTable *tablePtr)	/* Pointer to table structure, which is
 				 * supplied by the caller. */
 {
 #if (TCL_SMALL_HASH_TABLE != 4)
@@ -911,8 +910,8 @@ TclReleaseLiteral(
 
 static size_t
 HashString(
-    const char *string,	/* String for which to compute hash value. */
-    size_t length)			/* Number of bytes in the string. */
+    const char *string,		/* String for which to compute hash value. */
+    size_t length)		/* Number of bytes in the string. */
 {
     size_t result = 0;
 
@@ -975,8 +974,7 @@ HashString(
 
 static void
 RebuildLiteralTable(
-    LiteralTable *tablePtr)
-				/* Local or global table to enlarge. */
+    LiteralTable *tablePtr)	/* Local or global table to enlarge. */
 {
     LiteralEntry **oldBuckets;
     LiteralEntry **oldChainPtr, **newChainPtr;
diff --git a/generic/tclNotify.c b/generic/tclNotify.c
index 8d92f1f..628beb7 100644
--- a/generic/tclNotify.c
+++ b/generic/tclNotify.c
@@ -1327,7 +1327,7 @@ Tcl_ServiceModeHook(
 
 void
 Tcl_SetTimer(
-    const Tcl_Time *timePtr)		/* Timeout value, may be NULL. */
+    const Tcl_Time *timePtr)	/* Timeout value, may be NULL. */
 {
     if (tclNotifierHooks.setTimerProc) {
 	tclNotifierHooks.setTimerProc(timePtr);
@@ -1358,7 +1358,7 @@ Tcl_SetTimer(
 
 int
 Tcl_WaitForEvent(
-    const Tcl_Time *timePtr)		/* Maximum block time, or NULL. */
+    const Tcl_Time *timePtr)	/* Maximum block time, or NULL. */
 {
     if (tclNotifierHooks.waitForEventProc) {
 	return tclNotifierHooks.waitForEventProc(timePtr);
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 7e6e4b2..fdefcb3 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -1034,9 +1034,9 @@ TclDbDumpActiveObjects(
 void
 TclDbInitNewObj(
     Tcl_Obj *objPtr,
-    const char *file,	/* The name of the source file calling this
+    const char *file,		/* The name of the source file calling this
 				 * function; used for debugging. */
-    int line)		/* Line number in the source file; used for
+    int line)			/* Line number in the source file; used for
 				 * debugging. */
 {
     objPtr->refCount = 0;
@@ -1162,9 +1162,9 @@ Tcl_NewObj(void)
 
 Tcl_Obj *
 Tcl_DbNewObj(
-    const char *file,	/* The name of the source file calling this
+    const char *file,		/* The name of the source file calling this
 				 * function; used for debugging. */
-    int line)		/* Line number in the source file; used for
+    int line)			/* Line number in the source file; used for
 				 * debugging. */
 {
     Tcl_Obj *objPtr;
@@ -2353,7 +2353,7 @@ Tcl_NewDoubleObj(
 
 Tcl_Obj *
 Tcl_DbNewDoubleObj(
-    double dblValue,	/* Double used to initialize the object. */
+    double dblValue,		/* Double used to initialize the object. */
     const char *file,		/* The name of the source file calling this
 				 * function; used for debugging. */
     int line)			/* Line number in the source file; used for
@@ -2852,8 +2852,7 @@ Tcl_NewWideIntObj(
 
 Tcl_Obj *
 Tcl_NewWideUIntObj(
-    Tcl_WideUInt uwideValue)
-				/* Wide integer used to initialize the new
+    Tcl_WideUInt uwideValue)	/* Wide integer used to initialize the new
 				 * object. */
 {
     Tcl_Obj *objPtr;
@@ -2898,8 +2897,7 @@ Tcl_NewWideUIntObj(
 
 Tcl_Obj *
 Tcl_DbNewWideIntObj(
-    Tcl_WideInt wideValue,
-				/* Wide integer used to initialize the new
+    Tcl_WideInt wideValue,	/* Wide integer used to initialize the new
 				 * object. */
     const char *file,		/* The name of the source file calling this
 				 * function; used for debugging. */
@@ -2917,8 +2915,7 @@ Tcl_DbNewWideIntObj(
 
 Tcl_Obj *
 Tcl_DbNewWideIntObj(
-    Tcl_WideInt wideValue,
-				/* Long integer used to initialize the new
+    Tcl_WideInt wideValue,	/* Long integer used to initialize the new
 				 * object. */
     TCL_UNUSED(const char *) /*file*/,
     TCL_UNUSED(int) /*line*/)
@@ -2947,9 +2944,8 @@ Tcl_DbNewWideIntObj(
 
 void
 Tcl_SetWideIntObj(
-    Tcl_Obj *objPtr,	/* Object w. internal rep to init. */
-    Tcl_WideInt wideValue)
-				/* Wide integer used to initialize the
+    Tcl_Obj *objPtr,		/* Object w. internal rep to init. */
+    Tcl_WideInt wideValue)	/* Wide integer used to initialize the
 				 * object's value. */
 {
     if (Tcl_IsShared(objPtr)) {
@@ -2979,9 +2975,8 @@ Tcl_SetWideIntObj(
 
 void
 Tcl_SetWideUIntObj(
-    Tcl_Obj *objPtr,	/* Object w. internal rep to init. */
-    Tcl_WideUInt uwideValue)
-				/* Wide integer used to initialize the
+    Tcl_Obj *objPtr,		/* Object w. internal rep to init. */
+    Tcl_WideUInt uwideValue)	/* Wide integer used to initialize the
 				 * object's value. */
 {
     if (Tcl_IsShared(objPtr)) {
@@ -2994,7 +2989,7 @@ Tcl_SetWideUIntObj(
 	    Tcl_Panic("%s: memory overflow", "Tcl_SetWideUIntObj");
 	}
 	TclSetBignumInternalRep(objPtr, &bignumValue);
-    } {
+    } else {
 	TclSetIntObj(objPtr, (Tcl_WideInt)uwideValue);
     }
 }
@@ -3934,7 +3929,7 @@ Tcl_IsShared(
 #ifdef TCL_MEM_DEBUG
 void
 Tcl_DbIncrRefCount(
-    Tcl_Obj *objPtr,	/* The object we are registering a reference
+    Tcl_Obj *objPtr,		/* The object we are registering a reference
 				 * to. */
     const char *file,		/* The name of the source file calling this
 				 * function; used for debugging. */
@@ -4007,7 +4002,7 @@ Tcl_DbIncrRefCount(
 #ifdef TCL_MEM_DEBUG
 void
 Tcl_DbDecrRefCount(
-    Tcl_Obj *objPtr,	/* The object we are releasing a reference
+    Tcl_Obj *objPtr,		/* The object we are releasing a reference
 				 * to. */
     const char *file,		/* The name of the source file calling this
 				 * function; used for debugging. */
@@ -4084,16 +4079,17 @@ Tcl_DbDecrRefCount(
 
 int
 Tcl_DbIsShared(
-    Tcl_Obj *objPtr,	/* The object to test for being shared. */
+    Tcl_Obj *objPtr,		/* The object to test for being shared. */
 #ifdef TCL_MEM_DEBUG
     const char *file,		/* The name of the source file calling this
 				 * function; used for debugging. */
-    int line)			/* Line number in the source file; used for
+    int line			/* Line number in the source file; used for
 				 * debugging. */
 #else
     TCL_UNUSED(const char *) /*file*/,
-    TCL_UNUSED(int) /*line*/)
+    TCL_UNUSED(int) /*line*/
 #endif
+    )
 {
 #ifdef TCL_MEM_DEBUG
     if (objPtr->refCount == FREEDREFCOUNTFILLER) {
@@ -4161,8 +4157,7 @@ Tcl_DbIsShared(
 
 void
 Tcl_InitObjHashTable(
-    Tcl_HashTable *tablePtr)
-				/* Pointer to table record, which is supplied
+    Tcl_HashTable *tablePtr)	/* Pointer to table record, which is supplied
 				 * by the caller. */
 {
     Tcl_InitCustomHashTable(tablePtr, TCL_CUSTOM_PTR_KEYS,
diff --git a/generic/tclParse.c b/generic/tclParse.c
index dca351c..3879733 100644
--- a/generic/tclParse.c
+++ b/generic/tclParse.c
@@ -205,8 +205,7 @@ Tcl_ParseCommand(
 				 * close bracket should be considered a
 				 * command terminator. If zero, then close
 				 * bracket has no special meaning. */
-    Tcl_Parse *parsePtr)
-				/* Structure to fill in with information about
+    Tcl_Parse *parsePtr)	/* Structure to fill in with information about
 				 * the parsed command; any previous
 				 * information in the structure is ignored. */
 {
@@ -1619,8 +1618,7 @@ Tcl_ParseBraces(
     Tcl_Size numBytes,		/* Total number of bytes in string. If -1,
 				 * the string consists of all bytes up to the
 				 * first null character. */
-    Tcl_Parse *parsePtr,
-				/* Structure to fill in with information about
+    Tcl_Parse *parsePtr,	/* Structure to fill in with information about
 				 * the string. */
     int append,			/* Non-zero means append tokens to existing
 				 * information in parsePtr; zero means ignore
@@ -1820,8 +1818,7 @@ Tcl_ParseQuotedString(
     Tcl_Size numBytes,		/* Total number of bytes in string. If -1,
 				 * the string consists of all bytes up to the
 				 * first null character. */
-    Tcl_Parse *parsePtr,
-				/* Structure to fill in with information about
+    Tcl_Parse *parsePtr,	/* Structure to fill in with information about
 				 * the string. */
     int append,			/* Non-zero means append tokens to existing
 				 * information in parsePtr; zero means ignore
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 660bf53..be31501 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -836,9 +836,9 @@ Tcltest_SafeInit(
 static int
 TestasyncCmd(
     TCL_UNUSED(void *),
-    Tcl_Interp *interp,			/* Current interpreter. */
-    int objc,				/* Number of arguments. */
-    Tcl_Obj *const *objv)		/* Arguments. */
+    Tcl_Interp *interp,		/* Current interpreter. */
+    int objc,			/* Number of arguments. */
+    Tcl_Obj *const *objv)	/* Arguments. */
 {
     TestAsyncHandler *asyncPtr, *prevPtr;
     int id, code;
@@ -1590,7 +1590,7 @@ TestcreatecommandCmd(
     TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
-    Tcl_Obj *const objv[])		/* Argument strings. */
+    Tcl_Obj *const objv[])	/* Argument strings. */
 {
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "option");
@@ -2995,7 +2995,7 @@ TestexprstringCmd(
     TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
-    Tcl_Obj *const *objv)		/* Argument strings. */
+    Tcl_Obj *const *objv)	/* Argument strings. */
 {
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "expression");
@@ -4641,8 +4641,8 @@ TestregexpCmd(
 
 static void
 TestregexpXflags(
-    const char *string,	/* The string of flags. */
-    size_t length,			/* The length of the string in bytes. */
+    const char *string,		/* The string of flags. */
+    size_t length,		/* The length of the string in bytes. */
     int *cflagsPtr,		/* compile flags word */
     int *eflagsPtr)		/* exec flags word */
 {
@@ -5885,7 +5885,7 @@ Testset2Cmd(
 static int
 TestmainthreadCmd(
     TCL_UNUSED(void *),
-    Tcl_Interp *interp,/* Current interpreter. */
+    Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const *objv)
 {
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index c7a9704..b8da2f7 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -1082,13 +1082,13 @@ static int V1TestListObjIndex(
 
 static const Tcl_ObjType v1TestListType = {
     "testlist",			/* name */
-    NULL,		/* freeIntRepProc */
-    NULL,		/* dupIntRepProc */
-    NULL,		/* updateStringProc */
-    NULL,		/* setFromAnyProc */
-    offsetof(Tcl_ObjType, indexProc),			/* This is a V1 objType, which doesn't have an indexProc */
-    V1TestListObjLength, /* always return 100, doesn't really matter */
-    V1TestListObjIndex, /* should never be accessed, because this objType = V1*/
+    NULL,			/* freeIntRepProc */
+    NULL,			/* dupIntRepProc */
+    NULL,			/* updateStringProc */
+    NULL,			/* setFromAnyProc */
+    offsetof(Tcl_ObjType, indexProc), /* This is a V1 objType, which doesn't have an indexProc */
+    V1TestListObjLength,	/* always return 100, doesn't really matter */
+    V1TestListObjIndex,		/* should never be accessed, because this objType = V1*/
     NULL, NULL, NULL, NULL, NULL, NULL
 };
 
@@ -1493,7 +1493,7 @@ TeststringobjCmd(
 	    }
 	    Tcl_SetWideIntObj(Tcl_GetObjResult(interp), length);
 	    break;
-	case 10: {				/* range */
+	case 10: {			/* range */
 	    Tcl_Size first, last;
 	    if (objc != 5) {
 		goto wrongNumArgs;
@@ -1567,7 +1567,7 @@ TeststringobjCmd(
 	    Tcl_AppendUnicodeToObj(varPtr[varIndex], unicode + length, size - length);
 	    Tcl_SetObjResult(interp, varPtr[varIndex]);
 	    break;
-	case 13: /* newunicode*/
+	case 13:			/* newunicode*/
 	    unicode = (Tcl_UniChar *)Tcl_Alloc((objc - 3) * sizeof(Tcl_UniChar));
 	    for (i = 0; i < (objc - 3); ++i) {
 		int val;
diff --git a/generic/tclTestProcBodyObj.c b/generic/tclTestProcBodyObj.c
index 0fedde8..e6cb48c 100644
--- a/generic/tclTestProcBodyObj.c
+++ b/generic/tclTestProcBodyObj.c
@@ -38,7 +38,7 @@ static const char checkCommand[] = "check";
  */
 
 typedef struct {
-    const char *cmdName;		/* command name */
+    const char *cmdName;	/* command name */
     Tcl_ObjCmdProc *proc;	/* command proc */
     int exportIt;		/* if 1, export the command */
 } CmdTable;
diff --git a/generic/tclThreadAlloc.c b/generic/tclThreadAlloc.c
index 152b43d..d4178cd 100644
--- a/generic/tclThreadAlloc.c
+++ b/generic/tclThreadAlloc.c
@@ -92,7 +92,7 @@ typedef struct {
     size_t numRemoves;		/* Number of removes from bucket */
     size_t numInserts;		/* Number of inserts into bucket */
     size_t numLocks;		/* Number of locks acquired */
-    size_t totalAssigned;		/* Total space assigned to bucket */
+    size_t totalAssigned;	/* Total space assigned to bucket */
 } Bucket;
 
 /*
diff --git a/generic/tclTimer.c b/generic/tclTimer.c
index 42221f0..bd0664e 100644
--- a/generic/tclTimer.c
+++ b/generic/tclTimer.c
@@ -1214,7 +1214,7 @@ AfterProc(
 
 static void
 FreeAfterPtr(
-    AfterInfo *afterPtr)		/* Command to be deleted. */
+    AfterInfo *afterPtr)	/* Command to be deleted. */
 {
     AfterInfo *prevPtr;
     AfterAssocData *assocPtr = afterPtr->assocPtr;
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index ea3bba1..c28056d 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -1338,9 +1338,9 @@ TclScanElement(
 
 Tcl_Size
 Tcl_ConvertElement(
-    const char *src,	/* Source information for list element. */
-    char *dst,		/* Place to put list-ified element. */
-    int flags)		/* Flags produced by Tcl_ScanElement. */
+    const char *src,		/* Source information for list element. */
+    char *dst,			/* Place to put list-ified element. */
+    int flags)			/* Flags produced by Tcl_ScanElement. */
 {
     return Tcl_ConvertCountedElement(src, TCL_INDEX_NONE, dst, flags);
 }
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c
index 0e4f122..d946372 100644
--- a/generic/tclZipfs.c
+++ b/generic/tclZipfs.c
@@ -3883,8 +3883,7 @@ SerializeCentralDirectorySuffix(
     const unsigned char *end,	/* The end of writable memory. */
     unsigned char *buf,		/* Where to serialize to */
     int entryCount,		/* The number of entries in the directory */
-    long long dataStartOffset,
-				/* The overall file offset of the start of the
+    long long dataStartOffset,	/* The overall file offset of the start of the
 				 * data file. */
     long long directoryStartOffset,
 				/* The overall file offset of the start of the
diff --git a/macosx/tclMacOSXFCmd.c b/macosx/tclMacOSXFCmd.c
index 6cb5f8e..e26dca2 100644
--- a/macosx/tclMacOSXFCmd.c
+++ b/macosx/tclMacOSXFCmd.c
@@ -70,11 +70,11 @@ static int		SetOSTypeFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
 static void		UpdateStringOfOSType(Tcl_Obj *objPtr);
 
 static const Tcl_ObjType tclOSTypeType = {
-    "osType",				/* name */
-    NULL,				/* freeIntRepProc */
-    NULL,				/* dupIntRepProc */
-    UpdateStringOfOSType,		/* updateStringProc */
-    SetOSTypeFromAny,			/* setFromAnyProc */
+    "osType",			/* name */
+    NULL,			/* freeIntRepProc */
+    NULL,			/* dupIntRepProc */
+    UpdateStringOfOSType,	/* updateStringProc */
+    SetOSTypeFromAny,		/* setFromAnyProc */
     TCL_OBJTYPE_V0
 };
 
diff --git a/macosx/tclMacOSXNotify.c b/macosx/tclMacOSXNotify.c
index aa527c7..d096b35 100644
--- a/macosx/tclMacOSXNotify.c
+++ b/macosx/tclMacOSXNotify.c
@@ -822,7 +822,7 @@ TclpAlertNotifier(
 
 void
 TclpSetTimer(
-    const Tcl_Time *timePtr)		/* Timeout value, may be NULL. */
+    const Tcl_Time *timePtr)	/* Timeout value, may be NULL. */
 {
     ThreadSpecificData *tsdPtr;
     CFRunLoopTimerRef runLoopTimer;
@@ -1183,7 +1183,7 @@ TclpNotifierData(void)
 
 int
 TclpWaitForEvent(
-    const Tcl_Time *timePtr)		/* Maximum block time, or NULL. */
+    const Tcl_Time *timePtr)	/* Maximum block time, or NULL. */
 {
     int result, polling, runLoopRunning;
     CFTimeInterval waitTime;
diff --git a/unix/tclSelectNotfy.c b/unix/tclSelectNotfy.c
index 1235801..1f77cc2 100644
--- a/unix/tclSelectNotfy.c
+++ b/unix/tclSelectNotfy.c
@@ -643,7 +643,7 @@ NotifierProc(
 
 int
 TclpWaitForEvent(
-    const Tcl_Time *timePtr)		/* Maximum block time, or NULL. */
+    const Tcl_Time *timePtr)	/* Maximum block time, or NULL. */
 {
     FileHandler *filePtr;
     int mask;
diff --git a/unix/tclUnixCompat.c b/unix/tclUnixCompat.c
index def69fa..e9af3fc 100644
--- a/unix/tclUnixCompat.c
+++ b/unix/tclUnixCompat.c
@@ -986,8 +986,8 @@ CopyString(
 
 int
 TclWinCPUID(
-    int index,		/* Which CPUID value to retrieve. */
-    int *regsPtr)	/* Registers after the CPUID. */
+    int index,			/* Which CPUID value to retrieve. */
+    int *regsPtr)		/* Registers after the CPUID. */
 {
     int status = TCL_ERROR;
 
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
index 668ec7c..b6e1147 100644
--- a/unix/tclUnixFile.c
+++ b/unix/tclUnixFile.c
@@ -317,7 +317,7 @@ TclpMatchInDirectory(
 	    return TCL_OK;
 	}
 
-	d = TclOSopendir(native);				/* INTL: Native. */
+	d = TclOSopendir(native);			/* INTL: Native. */
 	if (d == NULL) {
 	    Tcl_DStringFree(&ds);
 	    if (interp != NULL) {
diff --git a/unix/tclUnixPipe.c b/unix/tclUnixPipe.c
index 9a032ee..f1ea101 100644
--- a/unix/tclUnixPipe.c
+++ b/unix/tclUnixPipe.c
@@ -401,7 +401,7 @@ TclpCreateProcess(
 				 * occurred when creating the child process.
 				 * Error messages from the child process
 				 * itself are sent to errorFile. */
-    size_t argc,			/* Number of arguments in following array. */
+    size_t argc,		/* Number of arguments in following array. */
     const char **argv,		/* Array of argument strings in UTF-8.
 				 * argv[0] contains the name of the executable
 				 * translated using Tcl_TranslateFileName
diff --git a/unix/tclUnixTest.c b/unix/tclUnixTest.c
index 31c92a9..75fad34 100644
--- a/unix/tclUnixTest.c
+++ b/unix/tclUnixTest.c
@@ -611,9 +611,9 @@ TestgotsigCmd(
 static int
 TestchmodCmd(
     TCL_UNUSED(void *),
-    Tcl_Interp *interp,			/* Current interpreter. */
+    Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
-    Tcl_Obj *const *objv)		/* Argument strings. */
+    Tcl_Obj *const *objv)	/* Argument strings. */
 {
     int i, mode;
 
diff --git a/unix/tclXtNotify.c b/unix/tclXtNotify.c
index e5bcb07..6d4e3c9 100644
--- a/unix/tclXtNotify.c
+++ b/unix/tclXtNotify.c
@@ -263,7 +263,7 @@ NotifierExitHandler(
 
 static void
 SetTimer(
-    const Tcl_Time *timePtr)		/* Timeout value, may be NULL. */
+    const Tcl_Time *timePtr)	/* Timeout value, may be NULL. */
 {
     unsigned long timeout;
 
@@ -627,7 +627,7 @@ FileHandlerEventProc(
 
 static int
 WaitForEvent(
-    const Tcl_Time *timePtr)		/* Maximum block time, or NULL. */
+    const Tcl_Time *timePtr)	/* Maximum block time, or NULL. */
 {
     int timeout;
 
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c
index 3b7bbea..3d64276 100644
--- a/win/tclWin32Dll.c
+++ b/win/tclWin32Dll.c
@@ -434,8 +434,8 @@ TclWinDriveLetterForVolMountPoint(
 
 int
 TclWinCPUID(
-    int index,		/* Which CPUID value to retrieve. */
-    int *regsPtr)	/* Registers after the CPUID. */
+    int index,			/* Which CPUID value to retrieve. */
+    int *regsPtr)		/* Registers after the CPUID. */
 {
     int status = TCL_ERROR;
 
diff --git a/win/tclWinNotify.c b/win/tclWinNotify.c
index 853ad9e..867e585 100644
--- a/win/tclWinNotify.c
+++ b/win/tclWinNotify.c
@@ -264,7 +264,7 @@ TclpAlertNotifier(
 
 void
 TclpSetTimer(
-    const Tcl_Time *timePtr)		/* Maximum block time, or NULL. */
+    const Tcl_Time *timePtr)	/* Maximum block time, or NULL. */
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
     UINT timeout;
@@ -464,7 +464,7 @@ TclpNotifierData(void)
 
 int
 TclpWaitForEvent(
-    const Tcl_Time *timePtr)		/* Maximum block time, or NULL. */
+    const Tcl_Time *timePtr)	/* Maximum block time, or NULL. */
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
     MSG msg;
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index dec7f13..1474567 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -916,7 +916,7 @@ TclpCreateProcess(
 				 * occurred when creating the child process.
 				 * Error messages from the child process
 				 * itself are sent to errorFile. */
-    size_t argc,			/* Number of arguments in following array. */
+    size_t argc,		/* Number of arguments in following array. */
     const char **argv,		/* Array of argument strings. argv[0] contains
 				 * the name of the executable converted to
 				 * native format (using the
@@ -1552,7 +1552,7 @@ static void
 BuildCommandLine(
     const char *executable,	/* Full path of executable (including
 				 * extension). Replacement for argv[0]. */
-    size_t argc,			/* Number of arguments. */
+    size_t argc,		/* Number of arguments. */
     const char **argv,		/* Argument strings in UTF. */
     Tcl_DString *linePtr)	/* Initialized Tcl_DString that receives the
 				 * command line (WCHAR). */
diff --git a/win/tclWinTest.c b/win/tclWinTest.c
index 8832235..9e2fdca 100644
--- a/win/tclWinTest.c
+++ b/win/tclWinTest.c
@@ -336,9 +336,9 @@ TestwinsleepCmd(
 static int
 TestExceptionCmd(
     TCL_UNUSED(void *),
-    Tcl_Interp* interp,			/* Tcl interpreter */
-    int objc,				/* Argument count */
-    Tcl_Obj *const objv[])		/* Argument vector */
+    Tcl_Interp* interp,		/* Tcl interpreter */
+    int objc,			/* Argument count */
+    Tcl_Obj *const objv[])	/* Argument vector */
 {
     static const char *const cmds[] = {
 	"access_violation", "datatype_misalignment", "array_bounds",