@@ -1,10 +1,8 @@
 /*
  * Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com>
  *
- * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsBIO.c,v 1.8 2004/03/24 05:22:53 razzell Exp $
- *
  * Provides BIO layer to interface openssl to Tcl.
  */
 
 #include "tlsInt.h"
 
@@ -59,21 +57,21 @@
     int bufLen;
 {
     Tcl_Channel chan = Tls_GetParent((State*)(bio->ptr));
     int ret;
 
-    dprintf(stderr,"\nBioWrite(0x%x, <buf>, %d) [0x%x]",
-	    (unsigned int) bio, bufLen, (unsigned int) chan);
+    dprintf("BioWrite(%p, <buf>, %d) [%p]",
+	    (void *) bio, bufLen, (void *) 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]",
-	    (unsigned int) chan, bufLen, ret, Tcl_Eof(chan), Tcl_GetErrno());
+    dprintf("[%p] BioWrite(%d) -> %d [%d.%d]",
+	    (void *) 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)) {
@@ -94,23 +92,23 @@
     int bufLen;
 {
     Tcl_Channel chan = Tls_GetParent((State*)bio->ptr);
     int ret = 0;
 
-    dprintf(stderr,"\nBioRead(0x%x, <buf>, %d) [0x%x]",
-	    (unsigned int) bio, bufLen, (unsigned int) chan);
+    dprintf("BioRead(%p, <buf>, %d) [%p]",
+	    (void *) bio, bufLen, (void *) 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]",
-	    (unsigned int) chan, bufLen, ret, Tcl_Eof(chan), Tcl_GetErrno());
+    dprintf("[%p] BioRead(%d) -> %d [%d.%d]",
+	    (void *) 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)) {
@@ -141,13 +139,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)",
-	    (unsigned int) bio, (unsigned int) cmd, (unsigned int) num,
-	    (unsigned int) ptr);
+    dprintf("BioCtrl(%p, 0x%x, 0x%x, %p)",
+	    (void *) bio, (unsigned int) cmd, (unsigned int) num,
+	    (void *) ptr);
 
     switch (cmd) {
     case BIO_CTRL_RESET:
 	num = 0;
     case BIO_C_FILE_SEEK:
@@ -180,24 +178,24 @@
 	break;
     case BIO_CTRL_SET_CLOSE:
 	bio->shutdown = (int)num;
 	break;
     case BIO_CTRL_EOF:
-	dprintf(stderr, "BIO_CTRL_EOF\n");
+	dprintf("BIO_CTRL_EOF");
 	ret = Tcl_Eof(chan);
 	break;
     case BIO_CTRL_PENDING:
 	ret = (Tcl_InputBuffered(chan) ? 1 : 0);
-	dprintf(stderr, "BIO_CTRL_PENDING(%d)\n", (int) ret);
+	dprintf("BIO_CTRL_PENDING(%d)", (int) ret);
 	break;
     case BIO_CTRL_WPENDING:
 	ret = 0;
 	break;
     case BIO_CTRL_DUP:
 	break;
     case BIO_CTRL_FLUSH:
-	dprintf(stderr, "BIO_CTRL_FLUSH\n");
+	dprintf("BIO_CTRL_FLUSH");
 	if (channelTypeVersion == TLS_CHANNEL_VERSION_2) {
 	    ret = ((Tcl_WriteRaw(chan, "", 0) >= 0) ? 1 : -1);
 	} else {
 	    ret = ((Tcl_Flush(chan) == TCL_OK) ? 1 : -1);
 	}