merge 8.7

1 files changed, 6 insertions, 13 deletions

diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c
index e529f77..d8106f4 100644
--- a/win/tclWinSerial.c
+++ b/win/tclWinSerial.c
@@ -285,11 +285,10 @@ SerialInit(void)
 
 static void
 SerialExitHandler(
-    ClientData dummy)	/* Old window proc */
+    TCL_UNUSED(ClientData))
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
     SerialInfo *infoPtr;
-    (void)dummy;
 
     /*
      * Clear all eventually pending output. Otherwise Tcl's exit could totally
@@ -324,10 +323,8 @@ SerialExitHandler(
 
 static void
 ProcExitHandler(
-    ClientData dummy)	/* Old window proc */
+    TCL_UNUSED(ClientData))
 {
-    (void)dummy;
-
     Tcl_MutexLock(&serialMutex);
     initialized = 0;
     Tcl_MutexUnlock(&serialMutex);
@@ -409,14 +406,13 @@ SerialGetMilliseconds(void)
 
 void
 SerialSetupProc(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(ClientData),
     int flags)			/* Event flags as passed to Tcl_DoOneEvent. */
 {
     SerialInfo *infoPtr;
     int block = 1;
     int msec = INT_MAX;		/* min. found block time */
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    (void)dummy;
 
     if (!(flags & TCL_FILE_EVENTS)) {
 	return;
@@ -465,7 +461,7 @@ SerialSetupProc(
 
 static void
 SerialCheckProc(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(ClientData),
     int flags)			/* Event flags as passed to Tcl_DoOneEvent. */
 {
     SerialInfo *infoPtr;
@@ -474,7 +470,6 @@ SerialCheckProc(
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
     COMSTAT cStat;
     unsigned int time;
-    (void)dummy;
 
     if (!(flags & TCL_FILE_EVENTS)) {
 	return;
@@ -606,14 +601,13 @@ SerialBlockProc(
 static int
 SerialCloseProc(
     ClientData instanceData,    /* Pointer to SerialInfo structure. */
-    Tcl_Interp *dummy,		/* For error reporting. */
+    TCL_UNUSED(Tcl_Interp *),
     int flags)
 {
     SerialInfo *serialPtr = (SerialInfo *) instanceData;
     int errorCode = 0, result = 0;
     SerialInfo *infoPtr, **nextPtrPtr;
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    (void)dummy;
 
     if ((flags & (TCL_CLOSE_READ | TCL_CLOSE_WRITE)) != 0) {
 	return EINVAL;
@@ -1256,11 +1250,10 @@ SerialWatchProc(
 static int
 SerialGetHandleProc(
     ClientData instanceData,	/* The serial state. */
-    int direction,		/* TCL_READABLE or TCL_WRITABLE */
+    TCL_UNUSED(int) /*direction*/,
     ClientData *handlePtr)	/* Where to store the handle. */
 {
     SerialInfo *infoPtr = (SerialInfo *) instanceData;
-    (void)direction;
 
     *handlePtr = (ClientData) infoPtr->handle;
     return TCL_OK;