@@ -116,24 +116,21 @@
  * Side effects:
  *	Closes the socket of the channel.
  *
  *-------------------------------------------------------------------
  */
-static int TlsCloseProc(ClientData instanceData, Tcl_Interp *interp) {
+static int TlsCloseProc(ClientData instanceData, TCL_UNUSED(Tcl_Interp *)) {
 	State *statePtr = (State *) instanceData;
 
-	dprintf("TlsCloseProc(%p)", (void *) statePtr);
+	dprintf("TlsCloseProc(%p)", statePtr);
 
 	Tls_Clean(statePtr);
-	Tcl_EventuallyFree((ClientData)statePtr, Tls_Free);
+	Tcl_EventuallyFree(statePtr, Tls_Free);
 
 	dprintf("Returning TCL_OK");
 
 	return(TCL_OK);
-
-	/* Interp is unused. */
-	interp = interp;
 }
 
 /*
  *------------------------------------------------------*
  *
@@ -150,11 +147,11 @@
 int Tls_WaitForConnect(State *statePtr, int *errorCodePtr, int handshakeFailureIsPermanent) {
 	unsigned long backingError;
 	int err, rc;
 	int bioShouldRetry;
 
-	dprintf("WaitForConnect(%p)", (void *) statePtr);
+	dprintf("WaitForConnect(%p)", statePtr);
 	dprintFlags(statePtr);
 
 	if (!(statePtr->flags & TLS_TCL_INIT)) {
 		dprintf("Tls_WaitForConnect called on already initialized channel -- returning with immediate success");
 		*errorCodePtr = 0;