merge 8.7

16 files changed, 78 insertions, 128 deletions

diff --git a/unix/tclEpollNotfy.c b/unix/tclEpollNotfy.c
index f1d8cca..f6ad8ce 100644
--- a/unix/tclEpollNotfy.c
+++ b/unix/tclEpollNotfy.c
@@ -183,7 +183,7 @@ Tcl_InitNotifier(void)
 
 void
 Tcl_FinalizeNotifier(
-    ClientData clientData)		/* Not used. */
+    ClientData clientData)
 {
     if (tclNotifierHooks.finalizeNotifierProc) {
 	tclNotifierHooks.finalizeNotifierProc(clientData);
diff --git a/unix/tclKqueueNotfy.c b/unix/tclKqueueNotfy.c
index 6361d63..184fb2b 100644
--- a/unix/tclKqueueNotfy.c
+++ b/unix/tclKqueueNotfy.c
@@ -169,7 +169,7 @@ Tcl_InitNotifier(void)
 
 void
 Tcl_FinalizeNotifier(
-    ClientData clientData)		/* Not used. */
+    ClientData clientData)
 {
     if (tclNotifierHooks.finalizeNotifierProc) {
 	tclNotifierHooks.finalizeNotifierProc(clientData);
diff --git a/unix/tclLoadDl.c b/unix/tclLoadDl.c
index 4b8fca6..f877055 100644
--- a/unix/tclLoadDl.c
+++ b/unix/tclLoadDl.c
@@ -281,13 +281,9 @@ UnloadFile(
 
 int
 TclGuessPackageName(
-    const char *fileName,	/* Name of file containing package (already
-				 * translated to local form if needed). */
-    Tcl_DString *bufPtr)	/* Initialized empty dstring. Append package
-				 * name to this if possible. */
+    TCL_UNUSED(const char *) /*fileName*/,
+    TCL_UNUSED(Tcl_DString *))
 {
-    (void)fileName;
-    (void)bufPtr;
     return 0;
 }
 
diff --git a/unix/tclLoadDyld.c b/unix/tclLoadDyld.c
index dac4160..a2ab24f 100644
--- a/unix/tclLoadDyld.c
+++ b/unix/tclLoadDyld.c
@@ -486,14 +486,9 @@ UnloadFile(
 
 int
 TclGuessPackageName(
-    const char *fileName,	/* Name of file containing package (already
-				 * translated to local form if needed). */
-    Tcl_DString *bufPtr)	/* Initialized empty dstring. Append package
-				 * name to this if possible. */
+    TCL_UNUSED(const char *) /*fileName*/,
+    TCL_UNUSED(Tcl_DString *) /*bufPtr*/)
 {
-    (void)fileName;
-    (void)bufPtr;
-
     return 0;
 }
 
@@ -516,11 +511,10 @@ TclGuessPackageName(
 #ifdef TCL_LOAD_FROM_MEMORY
 MODULE_SCOPE void *
 TclpLoadMemoryGetBuffer(
-    Tcl_Interp *dummy,		/* Used for error reporting. */
+    TCL_UNUSED(Tcl_Interp *),
     int size)			/* Size of desired buffer. */
 {
     void *buffer = NULL;
-    (void)dummy;
 
     /*
      * NSCreateObjectFileImageFromMemory is available but always fails
diff --git a/unix/tclSelectNotfy.c b/unix/tclSelectNotfy.c
index 2a22639..52b012a 100644
--- a/unix/tclSelectNotfy.c
+++ b/unix/tclSelectNotfy.c
@@ -376,7 +376,7 @@ Tcl_InitNotifier(void)
 
 void
 Tcl_FinalizeNotifier(
-    ClientData clientData)		/* Not used. */
+    ClientData clientData)
 {
     if (tclNotifierHooks.finalizeNotifierProc) {
 	tclNotifierHooks.finalizeNotifierProc(clientData);
@@ -928,7 +928,7 @@ Tcl_WaitForEvent(
 #if TCL_THREADS
 static TCL_NORETURN void
 NotifierThreadProc(
-    ClientData dummy)	/* Not used. */
+    TCL_UNUSED(ClientData))
 {
     ThreadSpecificData *tsdPtr;
     fd_set readableMask;
@@ -940,7 +940,6 @@ NotifierThreadProc(
     struct timeval poll = {0, 0}, *timePtr;
     char buf[2];
     int numFdBits = 0;
-    (void)dummy;
 
     if (pipe(fds) != 0) {
 	Tcl_Panic("NotifierThreadProc: %s", "could not create trigger pipe");
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c
index 7478627..c807b3c 100644
--- a/unix/tclUnixChan.c
+++ b/unix/tclUnixChan.c
@@ -351,12 +351,11 @@ FileOutputProc(
 static int
 FileCloseProc(
     void *instanceData,	/* File state. */
-    Tcl_Interp *dummy,		/* For error reporting - unused. */
+    TCL_UNUSED(Tcl_Interp *),
     int flags)
 {
     FileState *fsPtr = (FileState *)instanceData;
     int errorCode = 0;
-    (void)dummy;
 
     if ((flags & (TCL_CLOSE_READ | TCL_CLOSE_WRITE)) != 0) {
 	return EINVAL;
@@ -1880,9 +1879,8 @@ Tcl_GetOpenFile(
     const char *chanID,		/* String that identifies file. */
     int forWriting,		/* 1 means the file is going to be used for
 				 * writing, 0 means for reading. */
-    int dummy,		/* 1 means verify that the file was opened in
-				 * a mode that allows the access specified by
-				 * "forWriting". Ignored, we always check that
+    TCL_UNUSED(int),		/* Obsolete argument.
+				 * Ignored, we always check that
 				 * the channel is open for the requested
 				 * mode. */
     void **filePtr)	/* Store pointer to FILE structure here. */
@@ -1892,7 +1890,6 @@ Tcl_GetOpenFile(
     const Tcl_ChannelType *chanTypePtr;
     void *data;
     FILE *f;
-    (void)dummy;
 
     chan = Tcl_GetChannel(interp, chanID, &chanMode);
     if (chan == NULL) {
diff --git a/unix/tclUnixCompat.c b/unix/tclUnixCompat.c
index 3b81e6f..d7f64bd 100644
--- a/unix/tclUnixCompat.c
+++ b/unix/tclUnixCompat.c
@@ -334,10 +334,9 @@ TclpGetPwUid(
 #ifdef NEED_PW_CLEANER
 static void
 FreePwBuf(
-    ClientData dummy)
+    TCL_UNUSED(ClientData))
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    (void)dummy;
 
     Tcl_Free(tsdPtr->pbuf);
 }
@@ -518,10 +517,9 @@ TclpGetGrGid(
 #ifdef NEED_GR_CLEANER
 static void
 FreeGrBuf(
-    ClientData dummy)
+    TCL_UNUSED(ClientData))
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    (void)dummy;
 
     Tcl_Free(tsdPtr->gbuf);
 }
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c
index 1e2156c..b97c6ca 100644
--- a/unix/tclUnixFCmd.c
+++ b/unix/tclUnixFCmd.c
@@ -1233,16 +1233,13 @@ TraversalCopy(
 static int
 TraversalDelete(
     Tcl_DString *srcPtr,	/* Source pathname (native). */
-    Tcl_DString *dummy,	/* Destination pathname (not used). */
-    const Tcl_StatBuf *statBufPtr,
-				/* Stat info for file specified by srcPtr. */
+    TCL_UNUSED(Tcl_DString *),
+    TCL_UNUSED(const Tcl_StatBuf *),
     int type,			/* Reason for call - see TraverseUnixTree(). */
     Tcl_DString *errorPtr)	/* If non-NULL, uninitialized or free DString
 				 * filled with UTF-8 name of file causing
 				 * error. */
 {
-    (void)dummy;
-    (void)statBufPtr;
 
     switch (type) {
     case DOTREE_F:
@@ -1285,14 +1282,17 @@ TraversalDelete(
 
 static int
 CopyFileAtts(
-    const char *src,		/* Path name of source file (native). */
+#ifdef MAC_OSX_TCL
+    const char *src,	/* Path name of source file (native). */
+#else
+    TCL_UNUSED(const char *) /*src*/,
+#endif
     const char *dst,		/* Path name of target file (native). */
     const Tcl_StatBuf *statBufPtr)
 				/* Stat info for source file */
 {
     struct utimbuf tval;
     mode_t newMode;
-    (void)src;
 
     newMode = statBufPtr->st_mode
 	    & (S_ISUID | S_ISGID | S_IRWXU | S_IRWXG | S_IRWXO);
@@ -1344,14 +1344,13 @@ CopyFileAtts(
 static int
 GetGroupAttribute(
     Tcl_Interp *interp,		/* The interp we are using for errors. */
-    int objIndex,		/* The index of the attribute. */
+    TCL_UNUSED(int) /*objIndex*/,
     Tcl_Obj *fileName,		/* The name of the file (UTF-8). */
     Tcl_Obj **attributePtrPtr)	/* A pointer to return the object with. */
 {
     Tcl_StatBuf statBuf;
     struct group *groupPtr;
     int result;
-    (void)objIndex;
 
     result = TclpObjStat(fileName, &statBuf);
 
@@ -1399,14 +1398,13 @@ GetGroupAttribute(
 static int
 GetOwnerAttribute(
     Tcl_Interp *interp,		/* The interp we are using for errors. */
-    int objIndex,		/* The index of the attribute. */
+    TCL_UNUSED(int) /*objIndex*/,
     Tcl_Obj *fileName,		/* The name of the file (UTF-8). */
     Tcl_Obj **attributePtrPtr)	/* A pointer to return the object with. */
 {
     Tcl_StatBuf statBuf;
     struct passwd *pwPtr;
     int result;
-    (void)objIndex;
 
     result = TclpObjStat(fileName, &statBuf);
 
@@ -1452,13 +1450,12 @@ GetOwnerAttribute(
 static int
 GetPermissionsAttribute(
     Tcl_Interp *interp,		    /* The interp we are using for errors. */
-    int objIndex,		    /* The index of the attribute. */
+    TCL_UNUSED(int) /*objIndex*/,
     Tcl_Obj *fileName,		    /* The name of the file (UTF-8). */
     Tcl_Obj **attributePtrPtr)	    /* A pointer to return the object with. */
 {
     Tcl_StatBuf statBuf;
     int result;
-    (void)objIndex;
 
     result = TclpObjStat(fileName, &statBuf);
 
@@ -1495,14 +1492,13 @@ GetPermissionsAttribute(
 static int
 SetGroupAttribute(
     Tcl_Interp *interp,		/* The interp for error reporting. */
-    int objIndex,		/* The index of the attribute. */
+    TCL_UNUSED(int) /*objIndex*/,
     Tcl_Obj *fileName,		/* The name of the file (UTF-8). */
     Tcl_Obj *attributePtr)	/* New group for file. */
 {
     Tcl_WideInt gid;
     int result;
     const char *native;
-    (void)objIndex;
 
     if (Tcl_GetWideIntFromObj(NULL, attributePtr, &gid) != TCL_OK) {
 	Tcl_DString ds;
@@ -1563,14 +1559,13 @@ SetGroupAttribute(
 static int
 SetOwnerAttribute(
     Tcl_Interp *interp,		/* The interp for error reporting. */
-    int objIndex,		/* The index of the attribute. */
+    TCL_UNUSED(int) /*objIndex*/,
     Tcl_Obj *fileName,		/* The name of the file (UTF-8). */
     Tcl_Obj *attributePtr)	/* New owner for file. */
 {
     Tcl_WideInt uid;
     int result;
     const char *native;
-    (void)objIndex;
 
     if (Tcl_GetWideIntFromObj(NULL, attributePtr, &uid) != TCL_OK) {
 	Tcl_DString ds;
@@ -1631,7 +1626,7 @@ SetOwnerAttribute(
 static int
 SetPermissionsAttribute(
     Tcl_Interp *interp,		/* The interp we are using for errors. */
-    int objIndex,		/* The index of the attribute. */
+    TCL_UNUSED(int) /*objIndex*/,
     Tcl_Obj *fileName,		/* The name of the file (UTF-8). */
     Tcl_Obj *attributePtr)	/* The attribute to set. */
 {
@@ -1641,7 +1636,6 @@ SetPermissionsAttribute(
     const char *native;
     const char *modeStringPtr = TclGetString(attributePtr);
     int scanned = TclParseAllWhiteSpace(modeStringPtr, -1);
-    (void)objIndex;
 
     /*
      * First supply support for octal number format
@@ -1754,7 +1748,7 @@ TclpObjListVolumes(void)
 
 static int
 GetModeFromPermString(
-    Tcl_Interp *dummy,		/* The interp we are using for errors. */
+    TCL_UNUSED(Tcl_Interp *),
     const char *modeStringPtr, /* Permissions string */
     mode_t *modePtr)		/* pointer to the mode value */
 {
@@ -1763,7 +1757,6 @@ GetModeFromPermString(
 				 * is passed in), to allow for the chmod style
 				 * manipulation. */
     int i,n, who, op, what, op_found, who_found;
-    (void)dummy;
 
     /*
      * We start off checking for an "rwxrwxrwx" style permissions string
@@ -1942,7 +1935,7 @@ GetModeFromPermString(
 
 int
 TclpObjNormalizePath(
-    Tcl_Interp *dummy,
+    TCL_UNUSED(Tcl_Interp *),
     Tcl_Obj *pathPtr,		/* An unshared object containing the path to
 				 * normalize. */
     int nextCheckpoint)		/* offset to start at in pathPtr.  Must either
@@ -1961,7 +1954,6 @@ TclpObjNormalizePath(
 #ifndef NO_REALPATH
     char normPath[MAXPATHLEN];
 #endif
-    (void)dummy;
 
     currentPathEndPosition = path + nextCheckpoint;
     if (*currentPathEndPosition == '/') {
@@ -2507,13 +2499,12 @@ SetUnixFileAttributes(
 static int
 GetUnixFileAttributes(
     Tcl_Interp *interp,		/* The interp we are using for errors. */
-    int objIndex,		/* The index of the attribute. */
+    TCL_UNUSED(int) /*objIndex*/,
     Tcl_Obj *fileName,		/* The name of the file (UTF-8). */
     Tcl_Obj **attributePtrPtr)	/* A pointer to return the object with. */
 {
     Tcl_StatBuf statBuf;
     int result;
-    (void)objIndex;
 
     result = TclpObjStat(fileName, &statBuf);
 
@@ -2549,14 +2540,13 @@ GetUnixFileAttributes(
 static int
 SetUnixFileAttributes(
     Tcl_Interp *interp,		/* The interp we are using for errors. */
-    int objIndex,		/* The index of the attribute. */
+    TCL_UNUSED(int) /*objIndex*/,
     Tcl_Obj *fileName,		/* The name of the file (UTF-8). */
     Tcl_Obj *attributePtr)	/* The attribute to set. */
 {
     Tcl_StatBuf statBuf;
     int result, readonly;
     const char *native;
-    (void)objIndex;
 
     if (Tcl_GetBooleanFromObj(interp, attributePtr, &readonly) != TCL_OK) {
 	return TCL_ERROR;
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
index 83c194a..33628a0 100644
--- a/unix/tclUnixFile.c
+++ b/unix/tclUnixFile.c
@@ -34,17 +34,15 @@ static int NativeMatchType(Tcl_Interp *interp, const char* nativeEntry,
  *---------------------------------------------------------------------------
  */
 
+#ifdef __CYGWIN__
 void
 TclpFindExecutable(
-    const char *argv0)		/* The value of the application's argv[0]
-				 * (native). */
+    TCL_UNUSED(const char *) /*argv0*/)
 {
     Tcl_Encoding encoding;
-#ifdef __CYGWIN__
     size_t length;
     wchar_t buf[PATH_MAX];
     char name[PATH_MAX * 3 + 1];
-    (void)argv0;
 
     GetModuleFileNameW(NULL, buf, PATH_MAX);
     cygwin_conv_path(3, buf, name, PATH_MAX);
@@ -56,7 +54,14 @@ TclpFindExecutable(
     encoding = Tcl_GetEncoding(NULL, NULL);
     TclSetObjNameOfExecutable(
 	    Tcl_NewStringObj(name, length), encoding);
+}
 #else
+void
+TclpFindExecutable(
+    const char *argv0)		/* The value of the application's argv[0]
+				 * (native). */
+{
+    Tcl_Encoding encoding;
     const char *name, *p;
     Tcl_StatBuf statBuf;
     Tcl_DString buffer, nameString, cwd, utfName;
@@ -194,8 +199,8 @@ TclpFindExecutable(
 
   done:
     Tcl_DStringFree(&buffer);
-#endif
 }
+#endif
 
 /*
  *----------------------------------------------------------------------
@@ -1021,9 +1026,8 @@ TclpObjLink(
 
 Tcl_Obj *
 TclpFilesystemPathType(
-    Tcl_Obj *pathPtr)
+    TCL_UNUSED(Tcl_Obj *))
 {
-    (void)pathPtr;
     /*
      * All native paths are of the same type.
      */
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index b37d4ad..137747f 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -1052,26 +1052,27 @@ TclpFindVariable(
  */
 
 #ifdef HAVE_COREFOUNDATION
+#ifdef TCL_FRAMEWORK
 static int
 MacOSXGetLibraryPath(
     Tcl_Interp *interp,
     int maxPathLen,
     char *tclLibPath)
 {
-    int foundInFramework = TCL_ERROR;
-
-#ifdef TCL_FRAMEWORK
-    foundInFramework = Tcl_MacOSXOpenVersionedBundleResources(interp,
+    return Tcl_MacOSXOpenVersionedBundleResources(interp,
 	    "com.tcltk.tcllibrary", TCL_FRAMEWORK_VERSION, 0, maxPathLen,
 	    tclLibPath);
+}
 #else
-    (void)interp;
-    (void)maxPathLen;
-    (void)tclLibPath;
-#endif
-
-    return foundInFramework;
+static int
+MacOSXGetLibraryPath(
+    TCL_UNUSED(Tcl_Interp *),
+    TCL_UNUSED(int),
+    TCL_UNUSED(char *))
+{
+    return TCL_ERROR;
 }
+#endif
 #endif /* HAVE_COREFOUNDATION */
 
 /*
diff --git a/unix/tclUnixPipe.c b/unix/tclUnixPipe.c
index a0445a2..e056f96 100644
--- a/unix/tclUnixPipe.c
+++ b/unix/tclUnixPipe.c
@@ -268,10 +268,9 @@ TclpTempFileName(void)
 Tcl_Obj *
 TclpTempFileNameForLibrary(
     Tcl_Interp *interp,		/* Tcl interpreter. */
-    Tcl_Obj *path)		/* Path name of the library in the VFS. */
+    TCL_UNUSED(Tcl_Obj *) /*path*/)
 {
     Tcl_Obj *retval = TclpTempFileName();
-    (void)path;
 
     if (retval == NULL) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -811,10 +810,9 @@ Tcl_CreatePipe(
     Tcl_Interp *interp,		/* Errors returned in result. */
     Tcl_Channel *rchan,		/* Returned read side. */
     Tcl_Channel *wchan,		/* Returned write side. */
-    int flags)			/* Reserved for future use. */
+    TCL_UNUSED(int) /*flags*/)	/* Reserved for future use. */
 {
     int fileNums[2];
-    (void)flags;
 
     if (pipe(fileNums) < 0) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf("pipe creation failed: %s",
@@ -1254,7 +1252,7 @@ Tcl_WaitPid(
 	/* ARGSUSED */
 int
 Tcl_PidObjCmd(
-    void *dummy,		/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const *objv)	/* Argument strings. */
@@ -1263,7 +1261,6 @@ Tcl_PidObjCmd(
     PipeState *pipePtr;
     int i;
     Tcl_Obj *resultPtr;
-    (void)dummy;
 
     if (objc > 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "?channelId?");
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 781ef33..6e27cc5 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -335,10 +335,8 @@ Tcl_GetHostName(void)
 
 int
 TclpHasSockets(
-    Tcl_Interp *dummy)		/* Not used. */
+    TCL_UNUSED(Tcl_Interp *))
 {
-    (void)dummy;
-
     return TCL_OK;
 }
 
@@ -624,12 +622,11 @@ TcpOutputProc(
 static int
 TcpCloseProc(
     void *instanceData,	/* The socket to close. */
-    Tcl_Interp *dummy)	/* For error reporting - unused  */
+    TCL_UNUSED(Tcl_Interp *))
 {
     TcpState *statePtr = (TcpState *)instanceData;
     int errorCode = 0;
     TcpFdList *fds;
-    (void)dummy;
 
     /*
      * Delete a file handler that may be active for this socket if this is a
@@ -686,13 +683,12 @@ TcpCloseProc(
 static int
 TcpClose2Proc(
     void *instanceData,	/* The socket to close. */
-    Tcl_Interp *dummy,		/* For error reporting. */
+    TCL_UNUSED(Tcl_Interp *),
     int flags)			/* Flags that indicate which side to close. */
 {
     TcpState *statePtr = (TcpState *)instanceData;
     int readError = 0;
     int writeError = 0;
-    (void)dummy;
 
     /*
      * Shutdown the OS socket handle.
@@ -1107,11 +1103,10 @@ TcpWatchProc(
 static int
 TcpGetHandleProc(
     void *instanceData,	/* The socket state. */
-    int direction,		/* Not used. */
+    TCL_UNUSED(int) /*direction*/,
     void **handlePtr)	/* Where to store the handle. */
 {
     TcpState *statePtr = (TcpState *)instanceData;
-    (void)direction;
 
     *handlePtr = INT2PTR(statePtr->fds.fd);
     return TCL_OK;
@@ -1132,12 +1127,8 @@ TcpGetHandleProc(
 static void
 TcpAsyncCallback(
     void *clientData,	/* The socket state. */
-    int mask)			/* Events of interest; an OR-ed combination of
-				 * TCL_READABLE, TCL_WRITABLE and
-				 * TCL_EXCEPTION. */
+    TCL_UNUSED(int) /*mask*/)
 {
-    (void)mask;
-
     TcpConnect(NULL, (TcpState *)clientData);
 }
 
@@ -1768,7 +1759,7 @@ Tcl_OpenTcpServerEx(
 static void
 TcpAccept(
     void *data,		/* Callback token. */
-    int mask)			/* Not used. */
+    TCL_UNUSED(int) /*mask*/)
 {
     TcpFdList *fds = (TcpFdList *)data;	/* Client data of server socket. */
     int newsock;		/* The new client socket */
@@ -1777,7 +1768,6 @@ TcpAccept(
     socklen_t len;		/* For accept interface */
     char channelName[SOCK_CHAN_LENGTH];
     char host[NI_MAXHOST], port[NI_MAXSERV];
-    (void)mask;
 
     len = sizeof(addr);
     newsock = accept(fds->fd, &addr.sa, &len);
diff --git a/unix/tclUnixTest.c b/unix/tclUnixTest.c
index 8868bbe..b06abdf0 100644
--- a/unix/tclUnixTest.c
+++ b/unix/tclUnixTest.c
@@ -129,7 +129,7 @@ TclplatformtestInit(
 
 static int
 TestfilehandlerCmd(
-    ClientData dummy,	/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const *objv)	/* Argument strings. */
@@ -139,7 +139,6 @@ TestfilehandlerCmd(
     static int initialized = 0;
     char buffer[4000];
     TclFile file;
-    (void)dummy;
 
     /*
      * NOTE: When we make this code work on Windows also, the following
@@ -344,7 +343,7 @@ TestFileHandlerProc(
 
 static int
 TestfilewaitCmd(
-    ClientData dummy,	/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const *objv)	/* Argument strings. */
@@ -353,7 +352,6 @@ TestfilewaitCmd(
     Tcl_Channel channel;
     int fd;
     ClientData data;
-    (void)dummy;
 
     if (objc != 4) {
 	Tcl_WrongNumArgs(interp, 2, objv, "file readable|writable|both timeout");
@@ -413,13 +411,12 @@ TestfilewaitCmd(
 
 static int
 TestfindexecutableCmd(
-    ClientData dummy,	/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const *objv)	/* Argument strings. */
 {
     Tcl_Obj *saveName;
-    (void)dummy;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "argv0");
@@ -456,13 +453,12 @@ TestfindexecutableCmd(
 
 static int
 TestforkCmd(
-    ClientData dummy,	/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const *objv)	/* Argument strings. */
 {
     pid_t pid;
-    (void)dummy;
 
     if (objc != 1) {
         Tcl_WrongNumArgs(interp, 1, objv, "");
@@ -503,7 +499,7 @@ TestforkCmd(
 
 static int
 TestalarmCmd(
-    ClientData dummy,	/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const *objv)	/* Argument strings. */
@@ -511,7 +507,6 @@ TestalarmCmd(
 #ifdef SA_RESTART
     unsigned int sec = 1;
     struct sigaction action;
-    (void)dummy;
 
     if (objc > 1) {
 	Tcl_GetIntFromObj(interp, objv[1], (int *)&sec);
@@ -533,7 +528,6 @@ TestalarmCmd(
     (void) alarm(sec);
     return TCL_OK;
 #else
-    (void)dummy;
 
     Tcl_AppendResult(interp,
 	    "warning: sigaction SA_RESTART not support on this platform",
@@ -560,10 +554,8 @@ TestalarmCmd(
 
 static void
 AlarmHandler(
-    int signum)
+    TCL_UNUSED(int) /*signum*/)
 {
-    (void)signum;
-
     gotsig = "1";
 }
 
@@ -585,15 +577,11 @@ AlarmHandler(
 
 static int
 TestgotsigCmd(
-    ClientData dummy,	/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
-    Tcl_Obj *const *objv)		/* Argument strings. */
+    TCL_UNUSED(int) /*objc*/,
+    TCL_UNUSED(Tcl_Obj *const *))
 {
-    (void)dummy;
-    (void)objc;
-    (void)objv;
-
     Tcl_AppendResult(interp, gotsig, NULL);
     gotsig = "0";
     return TCL_OK;
@@ -620,13 +608,12 @@ TestgotsigCmd(
 
 static int
 TestchmodCmd(
-    ClientData dummy,			/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,			/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const *objv)		/* Argument strings. */
 {
     int i, mode;
-    (void)dummy;
 
     if (objc < 2) {
     Tcl_WrongNumArgs(interp, 1, objv, "mode file ?file ...?");
diff --git a/unix/tclUnixTime.c b/unix/tclUnixTime.c
index 1ca0cbb..d66b9c0 100644
--- a/unix/tclUnixTime.c
+++ b/unix/tclUnixTime.c
@@ -370,11 +370,9 @@ Tcl_QueryTimeProc(
 
 static void
 NativeScaleTime(
-    Tcl_Time *timePtr,
-    ClientData clientData)
+    TCL_UNUSED(Tcl_Time *),
+    TCL_UNUSED(ClientData))
 {
-    (void)timePtr;
-    (void)clientData;
     /* Native scale is 1:1. Nothing is done */
 }
 
@@ -398,10 +396,9 @@ NativeScaleTime(
 static void
 NativeGetTime(
     Tcl_Time *timePtr,
-    ClientData dummy)
+    TCL_UNUSED(ClientData))
 {
     struct timeval tv;
-    (void)dummy;
 
     (void) gettimeofday(&tv, NULL);
     timePtr->sec = tv.tv_sec;
diff --git a/unix/tclXtNotify.c b/unix/tclXtNotify.c
index b2ec6e6..f31503d 100644
--- a/unix/tclXtNotify.c
+++ b/unix/tclXtNotify.c
@@ -232,7 +232,7 @@ InitNotifier(void)
 
 static void
 NotifierExitHandler(
-    ClientData clientData)	/* Not used. */
+    TCL_UNUSED(ClientData))
 {
     if (notifier.currentTimeout != 0) {
 	XtRemoveTimeOut(notifier.currentTimeout);
@@ -305,7 +305,7 @@ SetTimer(
 
 static void
 TimerProc(
-    XtPointer clientData, /* Not used. */
+    TCL_UNUSED(XtPointer),
     XtIntervalId *id)
 {
     if (*id != notifier.currentTimeout) {
diff --git a/unix/tclXtTest.c b/unix/tclXtTest.c
index cb70b58..6c09a50 100644
--- a/unix/tclXtTest.c
+++ b/unix/tclXtTest.c
@@ -78,7 +78,7 @@ Tclxttest_Init(
 
 static int
 TesteventloopCmd(
-    ClientData clientData,	/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */