merge 8.7

40 files changed, 17 insertions, 147 deletions

diff --git a/generic/regcomp.c b/generic/regcomp.c
index c6c6beb..1aaaaed 100644
--- a/generic/regcomp.c
+++ b/generic/regcomp.c
@@ -807,7 +807,7 @@ parseqatom(
     atom = NULL;
     assert(lp->nouts == 0);	/* must string new code */
     assert(rp->nins == 0);	/* between lp and rp */
-    subno = 0;			/* just to shut lint up */
+    subno = 0;
 
     /*
      * An atom or constraint...
diff --git a/generic/regerror.c b/generic/regerror.c
index fb685f6..5d74340 100644
--- a/generic/regerror.c
+++ b/generic/regerror.c
@@ -54,7 +54,6 @@ static const struct rerr {
 /*
  - regerror - the interface to error numbers
  */
-/* ARGSUSED */
 size_t				/* Actual space needed (including NUL) */
 regerror(
     int code,			/* Error code, or REG_ATOI or REG_ITOA */
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 2d762e5..5d434bd 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -634,18 +634,15 @@ Tcl_CreateInterp(void)
      */
 
     if (sizeof(Tcl_CallFrame) < sizeof(CallFrame)) {
-	/*NOTREACHED*/
 	Tcl_Panic("Tcl_CallFrame must not be smaller than CallFrame");
     }
 
 #if defined(_WIN32) && !defined(_WIN64)
     if (sizeof(time_t) != 8) {
-	/*NOTREACHED*/
 	Tcl_Panic("<time.h> is not compatible with VS2005+");
     }
     if ((offsetof(Tcl_StatBuf,st_atime) != 32)
 	    || (offsetof(Tcl_StatBuf,st_ctime) != 48)) {
-	/*NOTREACHED*/
 	Tcl_Panic("<sys/stat.h> is not compatible with VS2005+");
     }
 #endif
@@ -6606,7 +6603,7 @@ Tcl_AppendObjToErrorInfo(
  *
  *----------------------------------------------------------------------
  */
-	/* ARGSUSED */
+
 int
 Tcl_VarEval(
     Tcl_Interp *interp,
diff --git a/generic/tclCkalloc.c b/generic/tclCkalloc.c
index 938bd8e..340be80 100644
--- a/generic/tclCkalloc.c
+++ b/generic/tclCkalloc.c
@@ -753,7 +753,6 @@ Tcl_AttemptDbCkrealloc(
  *
  *----------------------------------------------------------------------
  */
-	/* ARGSUSED */
 static int
 MemoryCmd(
     ClientData clientData,
@@ -1169,7 +1168,6 @@ Tcl_DbCkfree(
  *
  *----------------------------------------------------------------------
  */
-	/* ARGSUSED */
 void
 Tcl_InitMemory(
     TCL_UNUSED(Tcl_Interp *) /*interp*/)
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 89b0e7c..4d25d0b 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -117,7 +117,6 @@ static Tcl_ObjCmdProc PathTypeCmd;
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_BreakObjCmd(
     TCL_UNUSED(ClientData),
@@ -149,7 +148,6 @@ Tcl_BreakObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_CatchObjCmd(
     ClientData clientData,
@@ -255,7 +253,6 @@ CatchObjCmdCallback(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_CdObjCmd(
     TCL_UNUSED(ClientData),
@@ -311,7 +308,6 @@ Tcl_CdObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_ConcatObjCmd(
     TCL_UNUSED(ClientData),
@@ -346,7 +342,6 @@ Tcl_ConcatObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_ContinueObjCmd(
     TCL_UNUSED(ClientData),
@@ -645,7 +640,6 @@ EncodingSystemObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_ErrorObjCmd(
     TCL_UNUSED(ClientData),
@@ -695,7 +689,6 @@ Tcl_ErrorObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 EvalCmdErrMsg(
     TCL_UNUSED(ClientData *),
@@ -778,7 +771,6 @@ TclNREvalObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_ExitObjCmd(
     TCL_UNUSED(ClientData),
@@ -799,7 +791,6 @@ Tcl_ExitObjCmd(
 	return TCL_ERROR;
     }
     Tcl_Exit((int)value);
-    /*NOTREACHED*/
     return TCL_OK;		/* Better not ever reach this! */
 }
 
@@ -827,7 +818,6 @@ Tcl_ExitObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_ExprObjCmd(
     ClientData clientData,
@@ -1936,7 +1926,7 @@ FilesystemSeparatorCmd(
 	return TCL_ERROR;
     }
     if (objc == 1) {
-	const char *separator = NULL; /* lint */
+	const char *separator = NULL;
 
 	switch (tclPlatform) {
 	case TCL_PLATFORM_UNIX:
@@ -2239,7 +2229,6 @@ GetTypeFromMode(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_ForObjCmd(
     ClientData clientData,
@@ -2434,7 +2423,6 @@ ForPostNextCallback(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_ForeachObjCmd(
     ClientData clientData,
@@ -2752,7 +2740,6 @@ ForeachCleanup(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_FormatObjCmd(
     TCL_UNUSED(ClientData),
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index b2a03af..f8cdb04 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -4001,7 +4001,6 @@ SwitchPostProc(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_ThrowObjCmd(
     TCL_UNUSED(ClientData),
diff --git a/generic/tclCompCmdsSZ.c b/generic/tclCompCmdsSZ.c
index 6382bb9..982516a 100644
--- a/generic/tclCompCmdsSZ.c
+++ b/generic/tclCompCmdsSZ.c
@@ -3134,7 +3134,7 @@ IssueTryClausesInstructions(
 	    OP(				STR_EQ);
 	    JUMP4(			JUMP_FALSE, notECJumpSource);
 	} else {
-	    notECJumpSource = -1; /* LINT */
+	    notECJumpSource = -1;
 	}
 	OP(				POP);
 
@@ -3346,7 +3346,7 @@ IssueTryClausesFinallyInstructions(
 	    OP(				STR_EQ);
 	    JUMP4(			JUMP_FALSE, notECJumpSource);
 	} else {
-	    notECJumpSource = -1; /* LINT */
+	    notECJumpSource = -1;
 	}
 	OP(				POP);
 
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 1cbd26f..71a4cc4 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -3149,8 +3149,8 @@ EscapeToUtfProc(
 	charLimit = *dstCharsPtr;
     }
     result = TCL_OK;
-    tablePrefixBytes = NULL;	/* lint. */
-    tableToUnicode = NULL;	/* lint. */
+    tablePrefixBytes = NULL;
+    tableToUnicode = NULL;
     prefixBytes = dataPtr->prefixBytes;
     encodingPtr = NULL;
 
diff --git a/generic/tclEnv.c b/generic/tclEnv.c
index 16c666b..fb719c8 100644
--- a/generic/tclEnv.c
+++ b/generic/tclEnv.c
@@ -596,7 +596,6 @@ TclGetEnv(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static char *
 EnvTraceProc(
     TCL_UNUSED(ClientData),
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 1892113..93b1dd7 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -1385,7 +1385,6 @@ TclInThreadExit(void)
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_VwaitObjCmd(
     TCL_UNUSED(ClientData),
@@ -1449,7 +1448,6 @@ Tcl_VwaitObjCmd(
     return TCL_OK;
 }
 
-	/* ARGSUSED */
 static char *
 VwaitVarProc(
     void *clientData,		/* Pointer to integer to set to 1. */
@@ -1483,7 +1481,6 @@ VwaitVarProc(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_UpdateObjCmd(
     TCL_UNUSED(ClientData),
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index e459b39..13be2cc 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -1219,7 +1219,6 @@ DoTildeSubst(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_GlobObjCmd(
     TCL_UNUSED(ClientData),
@@ -1346,7 +1345,7 @@ Tcl_GlobObjCmd(
 	return TCL_ERROR;
     }
 
-    separators = NULL;		/* lint. */
+    separators = NULL;
     switch (tclPlatform) {
     case TCL_PLATFORM_UNIX:
 	separators = "/";
@@ -1707,7 +1706,6 @@ Tcl_GlobObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 TclGlob(
     Tcl_Interp *interp,		/* Interpreter for returning error message or
@@ -1726,7 +1724,7 @@ TclGlob(
     int result;
     Tcl_Obj *filenamesObj, *savedResultObj;
 
-    separators = NULL;		/* lint. */
+    separators = NULL;
     switch (tclPlatform) {
     case TCL_PLATFORM_UNIX:
 	separators = "/";
diff --git a/generic/tclHash.c b/generic/tclHash.c
index 12a452d..e633fb0 100644
--- a/generic/tclHash.c
+++ b/generic/tclHash.c
@@ -897,7 +897,6 @@ HashStringKey(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static Tcl_HashEntry *
 BogusFind(
     TCL_UNUSED(Tcl_HashTable *),
@@ -924,7 +923,6 @@ BogusFind(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static Tcl_HashEntry *
 BogusCreate(
     TCL_UNUSED(Tcl_HashTable *),
diff --git a/generic/tclIO.c b/generic/tclIO.c
index cabd2d1..45f2690 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -564,7 +564,6 @@ TclInitIOSubsystem(void)
  *-------------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 void
 TclFinalizeIOSubsystem(void)
 {
@@ -3352,7 +3351,6 @@ Tcl_SpliceChannel(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 TclClose(
     Tcl_Interp *interp,		/* Interpreter for errors. */
@@ -3546,7 +3544,6 @@ TclClose(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_CloseEx(
     Tcl_Interp *interp,		/* Interpreter for errors. */
@@ -8944,7 +8941,6 @@ TclChannelEventScriptInvoker(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_FileEventObjCmd(
     TCL_UNUSED(ClientData),
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index 15eaff0..d2f38ff 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -95,7 +95,6 @@ FinalizeIOCmdTSD(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_PutsObjCmd(
     TCL_UNUSED(ClientData),
@@ -209,7 +208,6 @@ Tcl_PutsObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_FlushObjCmd(
     TCL_UNUSED(ClientData),
@@ -274,7 +272,6 @@ Tcl_FlushObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_GetsObjCmd(
     TCL_UNUSED(ClientData),
@@ -359,7 +356,6 @@ Tcl_GetsObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_ReadObjCmd(
     TCL_UNUSED(ClientData),
@@ -489,7 +485,6 @@ Tcl_ReadObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_SeekObjCmd(
     TCL_UNUSED(ClientData),
@@ -565,7 +560,6 @@ Tcl_SeekObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_TellObjCmd(
     TCL_UNUSED(ClientData),
@@ -628,7 +622,6 @@ Tcl_TellObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_CloseObjCmd(
     TCL_UNUSED(ClientData),
@@ -737,7 +730,6 @@ Tcl_CloseObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_FconfigureObjCmd(
     TCL_UNUSED(ClientData),
@@ -813,7 +805,6 @@ Tcl_FconfigureObjCmd(
  *---------------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_EofObjCmd(
     TCL_UNUSED(ClientData),
@@ -853,7 +844,6 @@ Tcl_EofObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_ExecObjCmd(
     TCL_UNUSED(ClientData),
@@ -1021,7 +1011,6 @@ Tcl_ExecObjCmd(
  *---------------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_FblockedObjCmd(
     TCL_UNUSED(ClientData),
@@ -1068,7 +1057,6 @@ Tcl_FblockedObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_OpenObjCmd(
     TCL_UNUSED(ClientData),
@@ -1192,7 +1180,6 @@ Tcl_OpenObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static void
 TcpAcceptCallbacksDeleteProc(
     ClientData clientData,	/* Data which was passed when the assocdata
@@ -1782,7 +1769,6 @@ Tcl_FcopyObjCmd(
  *---------------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ChanPendingObjCmd(
     TCL_UNUSED(ClientData),
diff --git a/generic/tclIOGT.c b/generic/tclIOGT.c
index e9c4fae..512825c 100644
--- a/generic/tclIOGT.c
+++ b/generic/tclIOGT.c
@@ -249,7 +249,6 @@ ReleaseData(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 TclChannelTransform(
     Tcl_Interp *interp,		/* Interpreter for result. */
@@ -994,7 +993,6 @@ TransformGetOptionProc(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static void
 TransformWatchProc(
     ClientData instanceData,	/* Channel to watch. */
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index 09fbe9d..75d8283 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -4681,7 +4681,7 @@ static Tcl_Obj *
 NativeFilesystemSeparator(
     TCL_UNUSED(Tcl_Obj *) /*pathPtr*/)
 {
-    const char *separator = NULL; /* lint */
+    const char *separator = NULL;
 
     switch (tclPlatform) {
     case TCL_PLATFORM_UNIX:
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index 462d710..95962f8 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -598,7 +598,7 @@ InterpInfoDeleteProc(
  *
  *----------------------------------------------------------------------
  */
-	/* ARGSUSED */
+
 int
 Tcl_InterpObjCmd(
     ClientData clientData,
@@ -1474,8 +1474,6 @@ TclPreventAliasLoop(
 	}
 	nextAliasPtr = (Alias *)aliasCmdPtr->objClientData;
     }
-
-    /* NOTREACHED */
 }
 
 /*
diff --git a/generic/tclMain.c b/generic/tclMain.c
index a25b250..848ad18 100644
--- a/generic/tclMain.c
+++ b/generic/tclMain.c
@@ -731,7 +731,6 @@ TclFullFinalizationRequested(void)
  *----------------------------------------------------------------------
  */
 
-    /* ARGSUSED */
 static void
 StdinProc(
     ClientData clientData,	/* The state of interactive cmd line */
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index ed6b61a..2f5b7da 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -315,7 +315,6 @@ Tcl_PushCallFrame(
 
 	if (nsPtr->flags & NS_DEAD) {
 	    Tcl_Panic("Trying to push call frame for dead namespace");
-	    /*NOTREACHED*/
 	}
     }
 
diff --git a/generic/tclPanic.c b/generic/tclPanic.c
index 7c21de2..b7b6b96 100644
--- a/generic/tclPanic.c
+++ b/generic/tclPanic.c
@@ -65,7 +65,6 @@ Tcl_SetPanicProc(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 /*
  * The following comment is here so that Coverity's static analizer knows that
  * a Tcl_Panic() call can never return and avoids lots of false positives.
diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index 25821f1..6b4aa09 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -1060,7 +1060,6 @@ Tcl_PackageObjCmd(
     return Tcl_NRCallObjProc(interp, TclNRPackageObjCmd, clientData, objc, objv);
 }
 
-	/* ARGSUSED */
 int
 TclNRPackageObjCmd(
     TCL_UNUSED(ClientData),
diff --git a/generic/tclPreserve.c b/generic/tclPreserve.c
index 53e86bf..59ee40f 100644
--- a/generic/tclPreserve.c
+++ b/generic/tclPreserve.c
@@ -83,7 +83,6 @@ typedef struct {
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 void
 TclFinalizePreserve(void)
 {
diff --git a/generic/tclProc.c b/generic/tclProc.c
index f78027a..60b7662 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -148,7 +148,6 @@ static const Tcl_ObjType lambdaType = {
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_ProcObjCmd(
     TCL_UNUSED(ClientData),
@@ -884,7 +883,6 @@ Uplevel_Callback(
     return result;
 }
 
-	/* ARGSUSED */
 int
 Tcl_UplevelObjCmd(
     ClientData clientData,
diff --git a/generic/tclScan.c b/generic/tclScan.c
index 4a37cf1..237b00e 100644
--- a/generic/tclScan.c
+++ b/generic/tclScan.c
@@ -562,7 +562,6 @@ ValidateFormat(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_ScanObjCmd(
     TCL_UNUSED(ClientData),
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 8dccbc4..a1429fd 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -717,7 +717,6 @@ Tcltest_SafeInit(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestasyncCmd(
     TCL_UNUSED(ClientData),
@@ -964,7 +963,6 @@ TestbumpinterpepochObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestcmdinfoCmd(
     TCL_UNUSED(ClientData),
@@ -1035,7 +1033,6 @@ TestcmdinfoCmd(
     return TCL_OK;
 }
 
-	/*ARGSUSED*/
 static int
 CmdProc1(
     void *clientData,	/* String to return. */
@@ -1047,7 +1044,6 @@ CmdProc1(
     return TCL_OK;
 }
 
-	/*ARGSUSED*/
 static int
 CmdProc2(
     void *clientData,	/* String to return. */
@@ -1094,7 +1090,6 @@ CmdDelProc2(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestcmdtokenCmd(
     TCL_UNUSED(ClientData),
@@ -1158,7 +1153,6 @@ TestcmdtokenCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestcmdtraceCmd(
     TCL_UNUSED(ClientData),
@@ -1441,7 +1435,6 @@ CreatedCommandProc2(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestdcallCmd(
     TCL_UNUSED(ClientData),
@@ -1506,7 +1499,6 @@ DelCallbackProc(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestdelCmd(
     TCL_UNUSED(ClientData),
@@ -1706,7 +1698,6 @@ TestdoubledigitsObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestdstringCmd(
     TCL_UNUSED(ClientData),
@@ -1833,7 +1824,6 @@ static void SpecialFree(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestencodingObjCmd(
     TCL_UNUSED(ClientData),
@@ -2691,7 +2681,6 @@ TestgetplatformCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestinterpdeleteCmd(
     TCL_UNUSED(ClientData),
@@ -2732,7 +2721,6 @@ TestinterpdeleteCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestlinkCmd(
     TCL_UNUSED(ClientData),
@@ -3379,7 +3367,7 @@ TestlocaleCmd(
  *
  *----------------------------------------------------------------------
  */
-	/* ARGSUSED */
+
 static void
 CleanupTestSetassocdataTests(
     void *clientData,	/* Data to be released. */
@@ -3783,7 +3771,6 @@ TestprintObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestregexpObjCmd(
     TCL_UNUSED(ClientData),
@@ -4109,7 +4096,6 @@ TestregexpXflags(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestreturnObjCmd(
     TCL_UNUSED(ClientData),
@@ -4330,7 +4316,6 @@ TesttranslatefilenameCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestupvarCmd(
     TCL_UNUSED(ClientData),
@@ -4383,7 +4368,6 @@ TestupvarCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestseterrorcodeCmd(
     TCL_UNUSED(ClientData),
@@ -4436,7 +4420,6 @@ TestseterrorcodeCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestsetobjerrorcodeCmd(
     TCL_UNUSED(ClientData),
@@ -4465,7 +4448,6 @@ TestsetobjerrorcodeCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestfeventCmd(
     TCL_UNUSED(ClientData),
@@ -5115,7 +5097,6 @@ TestbytestringObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestsetCmd(
     void *data,		/* Additional flags for Get/SetVar2. */
@@ -5198,7 +5179,6 @@ Testset2Cmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestsaveresultCmd(
     TCL_UNUSED(ClientData),
@@ -5444,7 +5424,6 @@ TestexitmainloopCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestChannelCmd(
     TCL_UNUSED(ClientData),
@@ -5506,7 +5485,6 @@ TestChannelCmd(
 	chanPtr		= statePtr->topChanPtr;
 	chan		= (Tcl_Channel) chanPtr;
     } else {
-	/* lint */
 	statePtr	= NULL;
 	chan		= NULL;
     }
@@ -5913,7 +5891,6 @@ TestChannelCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestChannelEventCmd(
     TCL_UNUSED(ClientData),
@@ -6126,7 +6103,6 @@ TestChannelEventCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestSocketCmd(
     TCL_UNUSED(ClientData),
diff --git a/generic/tclThreadAlloc.c b/generic/tclThreadAlloc.c
index 4c223ec..763a289 100644
--- a/generic/tclThreadAlloc.c
+++ b/generic/tclThreadAlloc.c
@@ -989,7 +989,7 @@ GetBlocks(
 
 	blockPtr = NULL;
 	n = NBUCKETS;
-	size = 0; /* lint */
+	size = 0;
 	while (--n > (size_t)bucket) {
 	    if (cachePtr->buckets[n].numFree > 0) {
 		size = bucketInfo[n].blockSize;
diff --git a/generic/tclThreadTest.c b/generic/tclThreadTest.c
index f233b1e..2e5f05b 100644
--- a/generic/tclThreadTest.c
+++ b/generic/tclThreadTest.c
@@ -203,7 +203,6 @@ TclThread_Init(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ThreadObjCmd(
     TCL_UNUSED(ClientData),
@@ -491,7 +490,6 @@ ThreadObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ThreadCreate(
     Tcl_Interp *interp,		/* Current interpreter. */
@@ -1078,7 +1076,6 @@ ThreadEventProc(
  *------------------------------------------------------------------------
  */
 
-     /* ARGSUSED */
 static void
 ThreadFreeProc(
     void *clientData)
@@ -1105,7 +1102,6 @@ ThreadFreeProc(
  *------------------------------------------------------------------------
  */
 
-     /* ARGSUSED */
 static int
 ThreadDeleteEvent(
     Tcl_Event *eventPtr,	/* Really ThreadEvent */
@@ -1141,7 +1137,6 @@ ThreadDeleteEvent(
  *------------------------------------------------------------------------
  */
 
-     /* ARGSUSED */
 static void
 ThreadExitProc(
     void *clientData)
diff --git a/generic/tclTimer.c b/generic/tclTimer.c
index bd6dfe9..8118272 100644
--- a/generic/tclTimer.c
+++ b/generic/tclTimer.c
@@ -776,7 +776,6 @@ TclServiceIdle(void)
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_AfterObjCmd(
     TCL_UNUSED(ClientData),
@@ -1248,7 +1247,6 @@ FreeAfterPtr(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static void
 AfterCleanupProc(
     ClientData clientData,	/* Points to AfterAssocData for the
diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index b9a9a63..fdf3136 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -181,7 +181,6 @@ typedef struct {
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_TraceObjCmd(
     TCL_UNUSED(ClientData),
@@ -1278,7 +1277,6 @@ Tcl_UntraceCommand(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static void
 TraceCommandProc(
     ClientData clientData,	/* Information about the command trace. */
@@ -1962,7 +1960,6 @@ TraceExecutionProc(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static char *
 TraceVarProc(
     ClientData clientData,	/* Information about the variable trace. */
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 1bfde12..3348b90 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -574,7 +574,7 @@ FindElement(
     const char *limit;		/* Points just after list/dict's last byte. */
     int openBraces = 0;		/* Brace nesting level during parse. */
     int inQuotes = 0;
-    int size = 0;		/* lint. */
+    int size = 0;
     size_t numChars;
     int literal = 1;
     const char *p2;
diff --git a/generic/tclVar.c b/generic/tclVar.c
index 404d3f3..3fd4af6 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -1476,7 +1476,6 @@ TclPtrGetVarIdx(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_SetObjCmd(
     TCL_UNUSED(ClientData),
@@ -2673,7 +2672,6 @@ UnsetVarStruct(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_UnsetObjCmd(
     TCL_UNUSED(ClientData),
@@ -2741,7 +2739,6 @@ Tcl_UnsetObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_AppendObjCmd(
     TCL_UNUSED(ClientData),
@@ -2807,7 +2804,6 @@ Tcl_AppendObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_LappendObjCmd(
     TCL_UNUSED(ClientData),
@@ -3253,8 +3249,6 @@ ArrayPopulateSearch(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
-
 static int
 ArrayStartSearchCmd(
     TCL_UNUSED(ClientData),
@@ -3350,7 +3344,6 @@ ArrayDoneSearch(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ArrayAnyMoreCmd(
     TCL_UNUSED(ClientData),
@@ -3429,7 +3422,6 @@ ArrayAnyMoreCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ArrayNextElementCmd(
     TCL_UNUSED(ClientData),
@@ -3510,7 +3502,6 @@ ArrayNextElementCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ArrayDoneSearchCmd(
     TCL_UNUSED(ClientData),
@@ -3571,7 +3562,6 @@ ArrayDoneSearchCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ArrayExistsCmd(
     TCL_UNUSED(ClientData),
@@ -3612,7 +3602,6 @@ ArrayExistsCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ArrayGetCmd(
     TCL_UNUSED(ClientData),
@@ -3772,7 +3761,6 @@ ArrayGetCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ArrayNamesCmd(
     TCL_UNUSED(ClientData),
@@ -3940,7 +3928,6 @@ TclFindArrayPtrElements(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ArraySetCmd(
     TCL_UNUSED(ClientData),
@@ -4116,7 +4103,6 @@ ArraySetCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ArraySizeCmd(
     TCL_UNUSED(ClientData),
@@ -4176,7 +4162,6 @@ ArraySizeCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ArrayStatsCmd(
     TCL_UNUSED(ClientData),
@@ -4231,7 +4216,6 @@ ArrayStatsCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ArrayUnsetCmd(
     TCL_UNUSED(ClientData),
@@ -4368,7 +4352,6 @@ ArrayUnsetCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 Tcl_Command
 TclInitArrayCmd(
     Tcl_Interp *interp)		/* Current interpreter. */
@@ -5038,7 +5021,6 @@ Tcl_VariableObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_UpvarObjCmd(
     TCL_UNUSED(ClientData),
@@ -6443,7 +6425,6 @@ CompareVarKeys(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ArrayDefaultCmd(
     TCL_UNUSED(ClientData),
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c
index c807b3c..cabe3e5 100644
--- a/unix/tclUnixChan.c
+++ b/unix/tclUnixChan.c
@@ -220,7 +220,6 @@ static const Tcl_ChannelType ttyChannelType = {
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 FileBlockModeProc(
     void *instanceData,	/* File state. */
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c
index b97c6ca..ccd3600 100644
--- a/unix/tclUnixFCmd.c
+++ b/unix/tclUnixFCmd.c
@@ -132,7 +132,7 @@ enum {
     MACOSX_CREATOR_ATTRIBUTE, MACOSX_TYPE_ATTRIBUTE, MACOSX_HIDDEN_ATTRIBUTE,
     MACOSX_RSRCLENGTH_ATTRIBUTE,
 #endif
-    UNIX_INVALID_ATTRIBUTE /* lint - last enum value needs no trailing , */
+    UNIX_INVALID_ATTRIBUTE
 };
 
 const char *const tclpFileAttrStrings[] = {
@@ -967,7 +967,7 @@ TraverseUnixTree(
 
     errfile = NULL;
     result = TCL_OK;
-    targetLen = 0;		/* lint. */
+    targetLen = 0;
 
     source = Tcl_DStringValue(sourcePtr);
     if (TclOSlstat(source, &statBuf) != 0) {		/* INTL: Native. */
diff --git a/unix/tclUnixPipe.c b/unix/tclUnixPipe.c
index e056f96..6935e59 100644
--- a/unix/tclUnixPipe.c
+++ b/unix/tclUnixPipe.c
@@ -374,7 +374,6 @@ TclpCloseFile(
  *---------------------------------------------------------------------------
  */
 
-    /* ARGSUSED */
 int
 TclpCreateProcess(
     Tcl_Interp *interp,		/* Interpreter in which to leave errors that
@@ -900,7 +899,6 @@ TclGetAndDetachPids(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 PipeBlockModeProc(
     void *instanceData,	/* Pipe state. */
@@ -1249,7 +1247,6 @@ Tcl_WaitPid(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_PidObjCmd(
     TCL_UNUSED(ClientData),
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 6e27cc5..67f8614 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -379,7 +379,6 @@ TclpFinalizeSockets(void)
  * ----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TcpBlockModeProc(
     void *instanceData,	/* Socket state. */
@@ -525,7 +524,6 @@ WaitForConnect(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TcpInputProc(
     void *instanceData,	/* Socket state. */
@@ -618,7 +616,6 @@ TcpOutputProc(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TcpCloseProc(
     void *instanceData,	/* The socket to close. */
@@ -1099,7 +1096,6 @@ TcpWatchProc(
  * ----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TcpGetHandleProc(
     void *instanceData,	/* The socket state. */
@@ -1755,7 +1751,6 @@ Tcl_OpenTcpServerEx(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static void
 TcpAccept(
     void *data,		/* Callback token. */
diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c
index cdf81a3..c8cc191 100644
--- a/win/tclWinFCmd.c
+++ b/win/tclWinFCmd.c
@@ -1195,7 +1195,7 @@ TraverseWinTree(
 
     nativeErrfile = NULL;
     result = TCL_OK;
-    oldTargetLen = 0;		/* lint. */
+    oldTargetLen = 0;
 
     nativeSource = (WCHAR *) Tcl_DStringValue(sourcePtr);
     nativeTarget = (WCHAR *)
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index 9eb8159..e8f3daf 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -2740,7 +2740,6 @@ TclWinAddProcess(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_PidObjCmd(
     TCL_UNUSED(ClientData),
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index 79582fe..0bdb499 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -542,7 +542,6 @@ TclpFinalizeSockets(void)
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TcpBlockModeProc(
     ClientData instanceData,	/* Socket state. */
@@ -774,7 +773,6 @@ WaitForConnect(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TcpInputProc(
     ClientData instanceData,	/* Socket state. */
@@ -1034,7 +1032,6 @@ TcpOutputProc(
  *----------------------------------------------------------------------
  */
 
-    /* ARGSUSED */
 static int
 TcpCloseProc(
     ClientData instanceData,	/* The socket to close. */
@@ -1660,7 +1657,6 @@ TcpWatchProc(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TcpGetHandleProc(
     ClientData instanceData,	/* The socket state. */
@@ -2391,7 +2387,6 @@ Tcl_OpenTcpServerEx(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static void
 TcpAccept(
     TcpFdList *fds,	/* Server socket that accepted newSocket. */
@@ -2580,7 +2575,6 @@ InitSockets(void)
  *----------------------------------------------------------------------
  */
 
-    /* ARGSUSED */
 static int
 SocketsEnabled(void)
 {
@@ -2610,7 +2604,6 @@ SocketsEnabled(void)
  *----------------------------------------------------------------------
  */
 
-    /* ARGSUSED */
 static void
 SocketExitHandler(
     TCL_UNUSED(ClientData))
diff --git a/win/tclWinTest.c b/win/tclWinTest.c
index 97cc6f8..5bd8ca8 100644
--- a/win/tclWinTest.c
+++ b/win/tclWinTest.c
@@ -383,7 +383,6 @@ TestExceptionCmd(
     /* SMASH! */
     RaiseException(exceptions[cmd], EXCEPTION_NONCONTINUABLE, 0, NULL);
 
-    /* NOTREACHED */
     return TCL_OK;
 }
 
diff --git a/win/tclWinTime.c b/win/tclWinTime.c
index 643b899..7047cc5 100644
--- a/win/tclWinTime.c
+++ b/win/tclWinTime.c
@@ -752,7 +752,6 @@ CalibrationThread(
 	UpdateTimeEachSecond();
     }
 
-    /* lint */
     return (DWORD) 0;
 }