@@ -108,12 +108,16 @@
 
 static Tcl_Mutex *locks = NULL;
 static int locksCount = 0;
 static Tcl_Mutex init_mx;
 
-void CryptoThreadLockCallback(int mode, int n, const char *file, int line) {
-
+void CryptoThreadLockCallback(
+    int mode,
+    int n,
+    TCL_UNUSED(const char *),
+    TCL_UNUSED(int))
+{
 	if (mode & CRYPTO_LOCK) {
 		/* This debugging is turned off by default -- it's too noisy. */
 		/* dprintf("Called to lock (n=%i of %i)", n, locksCount); */
 		Tcl_MutexLock(&locks[n]);
 	} else {
@@ -122,12 +126,10 @@
 	}
 
 	/* dprintf("Returning"); */
 
 	return;
-	file = file;
-	line = line;
 }
 
 unsigned long CryptoThreadIdCallback(void) {
 	unsigned long ret;
 
@@ -415,11 +417,11 @@
 	size = size;
 	verify = verify;
 }
 #else
 static int
-PasswordCallback(char *buf, int size, int verify, void *udata)
+PasswordCallback(char *buf, int size, TCL_UNUSED(int) /* verify */, void *udata)
 {
     State *statePtr	= (State *) udata;
     Tcl_Interp *interp	= statePtr->interp;
     Tcl_Obj *cmdPtr;
     int result;
@@ -457,11 +459,10 @@
 	strncpy(buf, ret, (size_t) size);
 	return (int)strlen(ret);
     } else {
 	return -1;
     }
-    	verify = verify;
 }
 #endif
 
 /*
  *-------------------------------------------------------------------