Index: generic/tls.c
==================================================================
--- generic/tls.c
+++ generic/tls.c
@@ -471,10 +471,11 @@
  *-------------------------------------------------------------------
  */
 void KeyLogCallback(const SSL *ssl, const char *line) {
     char *str = getenv(SSLKEYLOGFILE);
     FILE *fd;
+    (void *) ssl;
 
     dprintf("Called");
 
     if (str) {
 	fd = fopen(str, "a");
@@ -940,10 +941,11 @@
     Tcl_Channel chan;        /* The channel to set a mode on. */
     State *statePtr;        /* client state for ssl socket */
     const char *errStr = NULL;
     int ret = 1;
     int err = 0;
+    (void) clientData;
 
     dprintf("Called");
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "channel");
@@ -999,11 +1001,10 @@
     }
 
     dprintf("Returning TCL_OK with data \"%i\"", ret);
     Tcl_SetObjResult(interp, Tcl_NewIntObj(ret));
     return(TCL_OK);
-	clientData = clientData;
 }
 
 static const char *command_opts [] = {
     "-alpn", "-cadir", "-cafile", "-cert", "-certfile", "-cipher", "-ciphers", "-ciphersuites",
     "-command", "-dhparams", "-key", "-keyfile", "-model", "-password", "-post_handshake",
@@ -1066,10 +1067,11 @@
     Tcl_Obj *alpnObj		= NULL;
     int ssl2 = 0, ssl3 = 0;
     int tls1 = 1, tls1_1 = 1, tls1_2 = 1, tls1_3 = 1;
     int proto = 0, level = -1;
     int verify = 0, require = 0, request = 1, post_handshake = 0;
+    (void) clientData;
 
     dprintf("Called");
 
 #if defined(NO_TLS1) || defined(OPENSSL_NO_TLS1)
     tls1 = 0;
@@ -1493,11 +1495,10 @@
      */
     dprintf("Returning %s", Tcl_GetChannelName(statePtr->self));
     Tcl_SetResult(interp, (char *) Tcl_GetChannelName(statePtr->self), TCL_VOLATILE);
 
     return TCL_OK;
-	clientData = clientData;
 }
 
 /*
  *-------------------------------------------------------------------
  *
@@ -1514,10 +1515,11 @@
  *-------------------------------------------------------------------
  */
 static int
 UnimportObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
     Tcl_Channel chan;		/* The channel to set a mode on. */
+    (void) clientData;
 
     dprintf("Called");
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "channel");
@@ -1542,11 +1544,10 @@
     if (Tcl_UnstackChannel(interp, chan) == TCL_ERROR) {
 	return TCL_ERROR;
     }
 
     return TCL_OK;
-	clientData = clientData;
 }
 
 /*
  *-------------------------------------------------------------------
  *
@@ -1916,10 +1917,11 @@
     char *channelName, *ciphers;
     int mode;
     const unsigned char *proto;
     unsigned int len;
     int nid, res;
+    (void) clientData;
 
     dprintf("Called");
 
     if (objc < 2 || objc > 3 || (objc == 3 && !strcmp(Tcl_GetString(objv[1]), "-local"))) {
 	Tcl_WrongNumArgs(interp, 1, objv, "?-local? channel");
@@ -2018,11 +2020,10 @@
     if (!res) {nid = 0;}
     LAPPEND_STR(interp, objPtr, "signatureType", OBJ_nid2ln(nid), -1);
 
     Tcl_SetObjResult(interp, objPtr);
     return TCL_OK;
-	clientData = clientData;
 }
 
 /*
  *-------------------------------------------------------------------
  *
@@ -2040,10 +2041,11 @@
     Tcl_Obj *objPtr, *listPtr;
     const SSL *ssl;
     const SSL_CIPHER *cipher;
     const SSL_SESSION *session;
     const EVP_MD *md;
+    (void) clientData;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "channel");
 	return(TCL_ERROR);
     }
@@ -2254,11 +2256,10 @@
     LAPPEND_INT(interp, objPtr, "caListCount", sk_X509_NAME_num(ca_list));
 
 
     Tcl_SetObjResult(interp, objPtr);
     return TCL_OK;
-	clientData = clientData;
 }
 
 /*
  *-------------------------------------------------------------------
  *
@@ -2277,10 +2278,11 @@
     static const char *commands [] = { "req", "strreq", NULL };
     enum command { C_REQ, C_STRREQ, C_DUMMY };
     Tcl_Size cmd;
     int isStr;
     char buffer[16384];
+    (void) clientData;
 
     dprintf("Called");
 
     if (objc < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "subcommand ?args?");
@@ -2469,11 +2471,10 @@
 	break;
     default:
 	break;
     }
     return TCL_OK;
-	clientData = clientData;
 }
 
 /********************/
 /* Init             */
 /********************/
@@ -2609,16 +2610,16 @@
     if (TlsLibInit(0) != TCL_OK) {
 	Tcl_AppendResult(interp, "could not initialize SSL library", (char *) NULL);
 	return TCL_ERROR;
     }
 
-    Tcl_CreateObjCommand(interp, "tls::connection", ConnectionInfoObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::handshake", HandshakeObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::import", ImportObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::misc", MiscObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::unimport", UnimportObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::status", StatusObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::connection", ConnectionInfoObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::handshake", HandshakeObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::import", ImportObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::misc", MiscObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::unimport", UnimportObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::status", StatusObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
 
     Tls_DigestCommands(interp);
     Tls_EncryptCommands(interp);
     Tls_InfoCommands(interp);
     Tls_KDFCommands(interp);
@@ -2754,10 +2755,10 @@
 	RAND_seed(rnd_seed, sizeof(rnd_seed));
     } while (RAND_status() != 1);
 #endif
 
 #if defined(OPENSSL_THREADS) && defined(TCL_THREADS)
-	Tcl_MutexUnlock(&init_mx);
+    Tcl_MutexUnlock(&init_mx);
 #endif
 
-	return(status);
+    return(status);
 }

Index: generic/tlsDigest.c
==================================================================
--- generic/tlsDigest.c
+++ generic/tlsDigest.c
@@ -152,10 +152,11 @@
     int res = 0, type = statePtr->format & 0xFF0;
     const EVP_MD *md = NULL;
     const EVP_CIPHER *cipher = NULL;
     const void *key = NULL, *iv = NULL, *salt = NULL;
     int key_len = 0;
+    (void *) macObj;
 
     dprintf("Called");
 
     /* Get digest */
     md = Util_GetDigest(interp, digestObj, type != TYPE_CMAC);
@@ -848,10 +849,11 @@
  *----------------------------------------------------------------------
  */
 static int DigestUnstackObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
     Tcl_Channel chan;
     int mode; /* OR-ed combination of TCL_READABLE and TCL_WRITABLE  */
+    (void) clientData;
 
     dprintf("Called");
 
     /* Validate arg count */
     if (objc != 2) {
@@ -876,11 +878,10 @@
 	return TCL_ERROR;
     }
 
     /* Pop transform from channel */
     return Tcl_UnstackChannel(interp, chan);
-    	clientData = clientData;
 }
 
 /*******************************************************************/
 
 /*
@@ -1320,22 +1321,26 @@
  *	Sets result to message digest or error message
  *
  *-------------------------------------------------------------------
  */
 static int MdObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
+    (void) clientData;
     return DigestMain(TYPE_MD, interp, objc, objv);
 }
 
 static int CMACObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
+    (void) clientData;
     return DigestMain(TYPE_CMAC, interp, objc, objv);
 }
 
 static int HMACObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
+    (void) clientData;
     return DigestMain(TYPE_HMAC, interp, objc, objv);
 }
 
 static int MACObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
+    (void) clientData;
     return DigestMain(TYPE_MAC, interp, objc, objv);
 }
 
 /*
  *-------------------------------------------------------------------
@@ -1369,26 +1374,31 @@
     Tcl_DecrRefCount(digestObj);
     return res;
 }
  
 int MD4ObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
+    (void) clientData;
     return TemplateCmd(interp, objc, objv, "md4", HEX_FORMAT | TYPE_MD);
 }
 
 int MD5ObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
+    (void) clientData;
     return TemplateCmd(interp, objc, objv, "md5", HEX_FORMAT | TYPE_MD);
 }
 
 int SHA1ObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
+    (void) clientData;
     return TemplateCmd(interp, objc, objv, "sha1", HEX_FORMAT | TYPE_MD);
 }
 
 int SHA256ObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
+    (void) clientData;
     return TemplateCmd(interp, objc, objv, "sha256", HEX_FORMAT | TYPE_MD);
 }
 
 int SHA512ObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
+    (void) clientData;
     return TemplateCmd(interp, objc, objv, "sha512", HEX_FORMAT | TYPE_MD);
 }
 
 /*
  *-------------------------------------------------------------------
@@ -1404,19 +1414,19 @@
  *	Creates commands
  *
  *-------------------------------------------------------------------
  */
 int Tls_DigestCommands(Tcl_Interp *interp) {
-    Tcl_CreateObjCommand(interp, "tls::digest", MdObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::md", MdObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::cmac", CMACObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::hmac", HMACObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::mac", MACObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::md4", MD4ObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::md5", MD5ObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::sha1", SHA1ObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::sha256", SHA256ObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::sha512", SHA512ObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::unstack", DigestUnstackObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::digest", MdObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::md", MdObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::cmac", CMACObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::hmac", HMACObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::mac", MACObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::md4", MD4ObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::md5", MD5ObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::sha1", SHA1ObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::sha256", SHA256ObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::sha512", SHA512ObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::unstack", DigestUnstackObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
     return TCL_OK;
 }
 

Index: generic/tlsEncrypt.c
==================================================================
--- generic/tlsEncrypt.c
+++ generic/tlsEncrypt.c
@@ -740,10 +740,11 @@
 static int EncryptChannelHandler(Tcl_Interp *interp, int type, const char *channel,
 	Tcl_Obj *cipherObj, Tcl_Obj *digestObj, Tcl_Obj *keyObj, Tcl_Obj *ivObj) {
     int mode; /* OR-ed combination of TCL_READABLE and TCL_WRITABLE */
     Tcl_Channel chan;
     EncryptState *statePtr;
+    (void *) digestObj;
 
     dprintf("Called");
 
     /* Validate args */
     if (channel == (const char *) NULL) {
@@ -806,10 +807,11 @@
  *----------------------------------------------------------------------
  */
 static int EncryptUnstackObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
     Tcl_Channel chan;
     int mode; /* OR-ed combination of TCL_READABLE and TCL_WRITABLE  */
+    (void) clientData;
 
     dprintf("Called");
 
     /* Validate arg count */
     if (objc != 2) {
@@ -834,11 +836,10 @@
 	return TCL_ERROR;
     }
 
     /* Pop transform from channel */
     return Tcl_UnstackChannel(interp, chan);
-    	clientData = clientData;
 }
 
 /*******************************************************************/
 
 /*
@@ -962,10 +963,11 @@
  */
 int EncryptCommandHandler(Tcl_Interp *interp, int type, Tcl_Obj *cmdObj,
 	Tcl_Obj *cipherObj, Tcl_Obj *digestObj, Tcl_Obj *keyObj, Tcl_Obj *ivObj) {
     EncryptState *statePtr;
     char *cmdName = Tcl_GetStringFromObj(cmdObj, NULL);
+    (void *) digestObj;
 
     dprintf("Called");
 
     if ((statePtr = EncryptStateNew(interp, type)) == NULL) {
 	Tcl_AppendResult(interp, "Memory allocation error", (char *) NULL);
@@ -1008,10 +1010,11 @@
 	Tcl_Obj *digestObj, Tcl_Obj *keyObj, Tcl_Obj *ivObj) {
     EVP_CIPHER_CTX *ctx = NULL;
     int data_len = 0, out_len = 0, len = 0, res = TCL_OK;
     unsigned char *data, *out_buf;
     Tcl_Obj *resultObj;
+    (void *) digestObj;
 
     dprintf("Called");
 
     /* Get data */
     if (dataObj != NULL) {
@@ -1078,10 +1081,11 @@
     EVP_CIPHER_CTX *ctx = NULL;
     int total = 0, res, out_len = 0, len;
     Tcl_Channel in = NULL, out = NULL;
     unsigned char in_buf[BUFFER_SIZE];
     unsigned char out_buf[BUFFER_SIZE+EVP_MAX_BLOCK_LENGTH];
+    (void *) digestObj;
 
     dprintf("Called");
 
     /* Open input file */
     if ((in = Tcl_FSOpenFileChannel(interp, inFileObj, "rb", 0444)) == (Tcl_Channel) NULL) {
@@ -1306,14 +1310,16 @@
  *	Command dependent
  *
  *-------------------------------------------------------------------
  */
 static int EncryptObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
+    (void) clientData;
     return EncryptMain(TYPE_ENCRYPT, interp, objc, objv);
 }
 
 static int DecryptObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
+    (void) clientData;
     return EncryptMain(TYPE_DECRYPT, interp, objc, objv);
 }
 
 /*
  *-------------------------------------------------------------------
@@ -1329,11 +1335,11 @@
  *	Creates commands
  *
  *-------------------------------------------------------------------
  */
 int Tls_EncryptCommands(Tcl_Interp *interp) {
-    Tcl_CreateObjCommand(interp, "tls::encrypt", EncryptObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::decrypt", DecryptObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::unstack2", EncryptUnstackObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::encrypt", EncryptObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::decrypt", DecryptObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::unstack2", EncryptUnstackObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
     return TCL_OK;
 }
 

Index: generic/tlsIO.c
==================================================================
--- generic/tlsIO.c
+++ generic/tlsIO.c
@@ -71,19 +71,17 @@
  *
  *-------------------------------------------------------------------
  */
 static int TlsCloseProc(ClientData instanceData, Tcl_Interp *interp) {
     State *statePtr = (State *) instanceData;
+    (void *) interp;
 
     dprintf("TlsCloseProc(%p)", (void *) statePtr);
 
     Tls_Clean(statePtr);
     Tcl_EventuallyFree((ClientData)statePtr, Tls_Free);
     return(0);
-
-	/* Interp is unused. */
-	interp = interp;
 }
 
 static int TlsClose2Proc(ClientData instanceData,    /* The socket state. */
     Tcl_Interp *interp,		/* For errors - can be NULL. */
     int flags)			/* Flags to close read and/or write side of channel */

Index: generic/tlsInfo.c
==================================================================
--- generic/tlsInfo.c
+++ generic/tlsInfo.c
@@ -220,10 +220,12 @@
  *	None.
  *
  *-------------------------------------------------------------------
  */
 static int CipherObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
+    (void) clientData;
+
     dprintf("Called");
 
     /* Clear errors */
     Tcl_ResetResult(interp);
     ERR_clear_error();
@@ -238,11 +240,10 @@
     } else {
 	Tcl_WrongNumArgs(interp, 1, objv, "?name?");
 	return TCL_ERROR;
     }
     return TCL_OK;
-	clientData = clientData;
 }
 
 /*
  *-------------------------------------------------------------------
  *
@@ -263,10 +264,11 @@
     SSL_CTX *ctx = NULL;
     SSL *ssl = NULL;
     STACK_OF(SSL_CIPHER) *sk = NULL;
     int index, verbose = 0, use_supported = 0, res = TCL_OK;
     int min_version, max_version;
+    (void) clientData;
 
     dprintf("Called");
 
     /* Clear errors */
     Tcl_ResetResult(interp);
@@ -424,11 +426,10 @@
 
 done:
     SSL_free(ssl);
     SSL_CTX_free(ctx);
     return res;
-	clientData = clientData;
 }
 
 /*******************************************************************/
 
 /*
@@ -530,10 +531,12 @@
  *	None.
  *
  *-------------------------------------------------------------------
  */
 int DigestsObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
+    (void) clientData;
+
     dprintf("Called");
 
     /* Clear errors */
     Tcl_ResetResult(interp);
     ERR_clear_error();
@@ -549,11 +552,10 @@
     } else {
 	Tcl_WrongNumArgs(interp, 1, objv, "?name?");
 	return TCL_ERROR;
     }
     return TCL_OK;
-	clientData = clientData;
 }
 
 /*******************************************************************/
 
 /*
@@ -598,10 +600,12 @@
  *	None.
  *
  *-------------------------------------------------------------------
  */
 int KdfsObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
+    (void) clientData;
+
     dprintf("Called");
 
     /* Clear errors */
     Tcl_ResetResult(interp);
     ERR_clear_error();
@@ -617,11 +621,10 @@
     } else {
 	Tcl_WrongNumArgs(interp, 1, objv, "?name?");
 	return TCL_ERROR;
     }
     return TCL_OK;
-	clientData = clientData;
 }
 
 /*******************************************************************/
 
 /*
@@ -703,10 +706,12 @@
  *	None.
  *
  *-------------------------------------------------------------------
  */
 int MacsObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
+    (void) clientData;
+
     dprintf("Called");
 
     /* Clear errors */
     Tcl_ResetResult(interp);
     ERR_clear_error();
@@ -721,11 +726,10 @@
     } else {
 	Tcl_WrongNumArgs(interp, 1, objv, "?name?");
 	return TCL_ERROR;
     }
     return TCL_OK;
-	clientData = clientData;
 }
 
 /*******************************************************************/
 
 /*
@@ -828,10 +832,12 @@
  *	None.
  *
  *-------------------------------------------------------------------
  */
 int PkeysObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
+    (void) clientData;
+
     dprintf("Called");
 
     /* Clear errors */
     Tcl_ResetResult(interp);
     ERR_clear_error();
@@ -846,11 +852,10 @@
     } else {
 	Tcl_WrongNumArgs(interp, 1, objv, "?name?");
 	return TCL_ERROR;
     }
     return TCL_OK;
-	clientData = clientData;
 }
 
 /*******************************************************************/
 
 /*
@@ -869,10 +874,11 @@
  *-------------------------------------------------------------------
  */
 static int
 ProtocolsObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
     Tcl_Obj *resultObj;
+    (void) clientData;
 
     dprintf("Called");
 
     /* Clear errors */
     Tcl_ResetResult(interp);
@@ -907,11 +913,10 @@
 #if !defined(NO_TLS1_3) && !defined(OPENSSL_NO_TLS1_3)
     Tcl_ListObjAppendElement(interp, resultObj, Tcl_NewStringObj(protocols[TLS_TLS1_3], -1));
 #endif
     Tcl_SetObjResult(interp, resultObj);
     return TCL_OK;
-	clientData = clientData;
 }
 
 /*******************************************************************/
 
 /*
@@ -930,10 +935,11 @@
  *-------------------------------------------------------------------
  */
 static int
 VersionObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
     Tcl_Obj *resultObj;
+    (void) clientData;
 
     dprintf("Called");
 
     /* Validate arg count */
     if (objc != 1) {
@@ -942,11 +948,10 @@
     }
 
     resultObj = Tcl_NewStringObj(OPENSSL_VERSION_TEXT, -1);
     Tcl_SetObjResult(interp, resultObj);
     return TCL_OK;
-	clientData = clientData;
 }
 
 /*******************************************************************/
 
 /*
@@ -970,16 +975,16 @@
     OpenSSL_add_all_ciphers();
     OpenSSL_add_all_digests();
     OpenSSL_add_all_algorithms();
 #endif
 
-    Tcl_CreateObjCommand(interp, "tls::cipher", CipherObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::ciphers", CiphersObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::digests", DigestsObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::kdfs", KdfsObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::macs", MacsObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::pkeys", PkeysObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::protocols", ProtocolsObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::version", VersionObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::cipher", CipherObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::ciphers", CiphersObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::digests", DigestsObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::kdfs", KdfsObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::macs", MacsObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::pkeys", PkeysObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::protocols", ProtocolsObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::version", VersionObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
     return TCL_OK;
 }
 

Index: generic/tlsKDF.c
==================================================================
--- generic/tlsKDF.c
+++ generic/tlsKDF.c
@@ -47,10 +47,11 @@
     unsigned char *pass = NULL, *salt = NULL;
     const EVP_MD *md = NULL;
     const EVP_CIPHER *cipher = NULL;
     int buf_len = (EVP_MAX_KEY_LENGTH + EVP_MAX_IV_LENGTH)*4, dk_len = buf_len;
     unsigned char tmpkeyiv[(EVP_MAX_KEY_LENGTH + EVP_MAX_IV_LENGTH)*4];
+    (void) clientData;
 
     dprintf("Called");
 
     /* Clear errors */
     Tcl_ResetResult(interp);
@@ -145,11 +146,10 @@
     }
 
     /* Clear data */
     memset(tmpkeyiv, 0, buf_len);
     return TCL_OK;
-	clientData = clientData;
 }
 
 /*
  *-------------------------------------------------------------------
  *
@@ -172,10 +172,11 @@
     unsigned char *salt = NULL, *key = NULL, *info = NULL, *out = NULL;
     int salt_len = 0, key_len = 0, info_len = 0, res = TCL_OK, fn;
     int dk_len = EVP_MAX_KEY_LENGTH + EVP_MAX_IV_LENGTH;
     size_t out_len;
     Tcl_Obj *resultObj;
+    (void) clientData;
 
     dprintf("Called");
 
     /* Clear errors */
     Tcl_ResetResult(interp);
@@ -319,10 +320,11 @@
     unsigned char *salt = NULL, *pass = NULL, *out = NULL;
     int salt_len = 0, pass_len = 0, dk_len = 64, res = TCL_OK, fn;
     uint64_t N = 0, p = 0, r = 0, maxmem = 0;
     size_t out_len;
     Tcl_Obj *resultObj;
+    (void) clientData;
 
     dprintf("Called");
 
     /* Clear errors */
     Tcl_ResetResult(interp);
@@ -466,11 +468,11 @@
  *	Creates commands
  *
  *-------------------------------------------------------------------
  */
 int Tls_KDFCommands(Tcl_Interp *interp) {
-    Tcl_CreateObjCommand(interp, "tls::hkdf", KDF_HKDF, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::pbkdf2", KDF_PBKDF2, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "tls::scrypt", KDF_Scrypt, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::hkdf", KDF_HKDF, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::pbkdf2", KDF_PBKDF2, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::scrypt", KDF_Scrypt, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
     return TCL_OK;
 }
 

Index: generic/tlsRand.c
==================================================================
--- generic/tlsRand.c
+++ generic/tlsRand.c
@@ -40,10 +40,11 @@
  */
 static int RAND_Random(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
     int out_len = 0, res;
     unsigned char *out_buf;
     Tcl_Obj *resultObj;
+    (void) clientData;
 
     dprintf("Called");
 
     /* Clear errors */
     Tcl_ResetResult(interp);
@@ -90,11 +91,10 @@
 	return TCL_ERROR;
     }
 
     Tcl_SetObjResult(interp, resultObj);
     return TCL_OK;
-	clientData = clientData;
 }
 
 /*
  *-------------------------------------------------------------------
  *
@@ -109,9 +109,9 @@
  *	Creates commands
  *
  *-------------------------------------------------------------------
  */
 int Tls_RandCommands(Tcl_Interp *interp) {
-    Tcl_CreateObjCommand(interp, "tls::random", RAND_Random, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "tls::random", RAND_Random, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
     return TCL_OK;
 }