Index: tlsBIO.c
==================================================================
--- tlsBIO.c
+++ tlsBIO.c
@@ -1,9 +1,9 @@
 /*
  * Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com>
  *
- * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsBIO.c,v 1.4 2000/08/15 00:02:08 hobbs Exp $
+ * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsBIO.c,v 1.5 2000/08/18 19:17:36 hobbs Exp $
  *
  * Provides BIO layer to interface openssl to Tcl.
  */
 
 #include "tlsInt.h"
@@ -59,20 +59,21 @@
     int bufLen;
 {
     Tcl_Channel chan = Tls_GetParent((State*)(bio->ptr));
     int ret;
 
-    dprintf(stderr,"\nBioWrite(0x%x, <buf>, %d) [0x%x]", bio, bufLen, chan);
+    dprintf(stderr,"\nBioWrite(0x%x, <buf>, %d) [0x%x]",
+	    (unsigned int) bio, bufLen, (unsigned int) chan);
 
     if (channelTypeVersion == TLS_CHANNEL_VERSION_2) {
 	ret = Tcl_WriteRaw(chan, buf, bufLen);
     } else {
 	ret = Tcl_Write(chan, buf, bufLen);
     }
 
-    dprintf(stderr,"\n[0x%x] BioWrite(%d) -> %d [%d.%d]", chan, bufLen, ret,
-	    Tcl_Eof(chan), Tcl_GetErrno());
+    dprintf(stderr,"\n[0x%x] BioWrite(%d) -> %d [%d.%d]",
+	    (unsigned int) chan, bufLen, ret, Tcl_Eof(chan), Tcl_GetErrno());
 
     BIO_clear_flags(bio, BIO_FLAGS_WRITE|BIO_FLAGS_SHOULD_RETRY);
 
     if (ret == 0) {
 	if (!Tcl_Eof(chan)) {
@@ -93,22 +94,23 @@
     int bufLen;
 {
     Tcl_Channel chan = Tls_GetParent((State*)bio->ptr);
     int ret = 0;
 
-    dprintf(stderr,"\nBioRead(0x%x, <buf>, %d) [0x%x]", bio, bufLen, chan);
+    dprintf(stderr,"\nBioRead(0x%x, <buf>, %d) [0x%x]",
+	    (unsigned int) bio, bufLen, (unsigned int) chan);
 
     if (buf == NULL) return 0;
 
     if (channelTypeVersion == TLS_CHANNEL_VERSION_2) {
 	ret = Tcl_ReadRaw(chan, buf, bufLen);
     } else {
 	ret = Tcl_Read(chan, buf, bufLen);
     }
 
-    dprintf(stderr,"\n[0x%x] BioRead(%d) -> %d [%d.%d]", chan, bufLen, ret,
-	    Tcl_Eof(chan), Tcl_GetErrno());
+    dprintf(stderr,"\n[0x%x] BioRead(%d) -> %d [%d.%d]",
+	    (unsigned int) chan, bufLen, ret, Tcl_Eof(chan), Tcl_GetErrno());
 
     BIO_clear_flags(bio, BIO_FLAGS_READ|BIO_FLAGS_SHOULD_RETRY);
 
     if (ret == 0) {
 	if (!Tcl_Eof(chan)) {
@@ -139,11 +141,13 @@
 {
     Tcl_Channel chan = Tls_GetParent((State*)bio->ptr);
     long ret = 1;
     int *ip;
 
-    dprintf(stderr,"\nBioCtrl(0x%x, 0x%x, 0x%x, 0x%x)", bio, cmd, num, ptr);
+    dprintf(stderr,"\nBioCtrl(0x%x, 0x%x, 0x%x, 0x%x)",
+	    (unsigned int) bio, (unsigned int) cmd, (unsigned int) num,
+	    (unsigned int) ptr);
 
     switch (cmd) {
     case BIO_CTRL_RESET:
 	num = 0;
     case BIO_C_FILE_SEEK:
@@ -181,11 +185,11 @@
 	dprintf(stderr, "BIO_CTRL_EOF\n");
 	ret = Tcl_Eof(chan);
 	break;
     case BIO_CTRL_PENDING:
 	ret = (Tcl_InputBuffered(chan) ? 1 : 0);
-	dprintf(stderr, "BIO_CTRL_PENDING(%d)\n", ret);
+	dprintf(stderr, "BIO_CTRL_PENDING(%d)\n", (int) ret);
 	break;
     case BIO_CTRL_WPENDING:
 	ret = 0;
 	break;
     case BIO_CTRL_DUP:

Index: tlsIO.c
==================================================================
--- tlsIO.c
+++ tlsIO.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com>
  * Copyright (C) 2000 Ajuba Solutions
  *
- * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsIO.c,v 1.10 2000/08/15 18:49:30 hobbs Exp $
+ * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsIO.c,v 1.11 2000/08/18 19:17:36 hobbs Exp $
  *
  * TLS (aka SSL) Channel - can be layered on any bi-directional
  * Tcl_Channel (Note: Requires Trf Core Patch)
  *
  * This was built from scratch based upon observation of OpenSSL 0.9.2B
@@ -283,11 +283,11 @@
 TlsCloseProc(ClientData instanceData,	/* The socket to close. */
              Tcl_Interp *interp)	/* For error reporting - unused. */
 {
     State *statePtr = (State *) instanceData;
 
-    dprintf(stderr,"\nTlsCloseProc(0x%x)", statePtr);
+    dprintf(stderr,"\nTlsCloseProc(0x%x)", (unsigned int) statePtr);
 
     if (channelTypeVersion == TLS_CHANNEL_VERSION_1) {
 	/*
 	 * Remove event handler to underlying channel, this could
 	 * be because we are closing for real, or being "unstacked".
@@ -409,11 +409,11 @@
     State *statePtr = (State *) instanceData;
     int written, err;
 
     *errorCodePtr = 0;
 
-    dprintf(stderr,"\nBIO_write(0x%x, %d)", statePtr, toWrite);
+    dprintf(stderr,"\nBIO_write(0x%x, %d)", (unsigned int) statePtr, toWrite);
 
     if (!SSL_is_init_finished(statePtr->ssl)) {
 	written = Tls_WaitForConnect(statePtr, errorCodePtr);
 	if (written <= 0) {
 	    goto output;
@@ -440,11 +440,11 @@
 	 * work correctly.  Similar fix in TlsInputProc. - hobbs
 	 */
 	ERR_clear_error();
 	written = BIO_write(statePtr->bio, buf, toWrite);
 	dprintf(stderr,"\nBIO_write(0x%x, %d) -> [%d]",
-		statePtr, toWrite, written);
+		(unsigned int) statePtr, toWrite, written);
     }
     if (written <= 0) {
 	switch ((err = SSL_get_error(statePtr->ssl, written))) {
 	    case SSL_ERROR_NONE:
 		if (written < 0) {
@@ -847,11 +847,11 @@
     State *statePtr;
     int *errorCodePtr;		/* Where to store error code. */
 {
     int err;
 
-    dprintf(stderr,"\nWaitForConnect(0x%x)", statePtr);
+    dprintf(stderr,"\nWaitForConnect(0x%x)", (unsigned int) statePtr);
 
     for (;;) {
 	/* Not initialized yet! */
 	if (statePtr->flags & TLS_TCL_SERVER) {
 	    err = SSL_accept(statePtr->ssl);