@@ -1,9 +1,9 @@
 /*
  * Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com>
  *
- * Provides BIO layer to interface OpenSSL to TCL.
+ * Provides BIO layer to interface OpenSSL to Tcl.
  */
 
 #include "tlsInt.h"
 
 /* Called by SSL_write() */
@@ -14,39 +14,36 @@
 
     chan = Tls_GetParent((State *) BIO_get_data(bio), 0);
 
     dprintf("[chan=%p] BioWrite(%p, <buf>, %d)", (void *)chan, (void *) bio, bufLen);
 
-    ret = Tcl_WriteRaw(chan, buf, (Tcl_Size) bufLen);
+    ret = Tcl_WriteRaw(chan, buf, (Tcl_Size)bufLen);
 
     tclEofChan = Tcl_Eof(chan);
     tclErrno = Tcl_GetErrno();
 
     dprintf("[chan=%p] BioWrite(%d) -> %" TCL_SIZE_MODIFIER "d [tclEof=%d; tclErrno=%d]",
-	(void *) chan, bufLen, ret, tclEofChan, tclErrno);
+	    (void *) chan, bufLen, ret, tclEofChan, tclErrno);
 
     BIO_clear_flags(bio, BIO_FLAGS_WRITE | BIO_FLAGS_SHOULD_RETRY);
 
     if (tclEofChan && ret <= 0) {
 	dprintf("Got EOF while reading, returning a Connection Reset error which maps to Soft EOF");
 	Tcl_SetErrno(ECONNRESET);
 	ret = 0;
-
     } else if (ret == 0) {
 	dprintf("Got 0 from Tcl_WriteRaw, and EOF is not set; ret = 0");
 	dprintf("Setting retry read flag");
 	BIO_set_retry_read(bio);
-
     } else if (ret < 0) {
 	dprintf("We got some kind of I/O error");
 
 	if (tclErrno == EAGAIN) {
 	    dprintf("It's EAGAIN");
 	} else {
 	    dprintf("It's an unexpected error: %s/%i", Tcl_ErrnoMsg(tclErrno), tclErrno);
 	}
-
     } else {
 	dprintf("Successfully wrote %" TCL_SIZE_MODIFIER "d bytes of data", ret);
     }
 
     if (ret != -1 || (ret == -1 && tclErrno == EAGAIN)) {
@@ -71,39 +68,36 @@
 
     if (buf == NULL) {
 	return 0;
     }
 
-    ret = Tcl_ReadRaw(chan, buf, (Tcl_Size) bufLen);
+    ret = Tcl_ReadRaw(chan, buf, (Tcl_Size)bufLen);
 
     tclEofChan = Tcl_Eof(chan);
     tclErrno = Tcl_GetErrno();
 
     dprintf("[chan=%p] BioRead(%d) -> %" TCL_SIZE_MODIFIER "d [tclEof=%d; tclErrno=%d]",
-	(void *) chan, bufLen, ret, tclEofChan, tclErrno);
+	    (void *) chan, bufLen, ret, tclEofChan, tclErrno);
 
     BIO_clear_flags(bio, BIO_FLAGS_READ | BIO_FLAGS_SHOULD_RETRY);
 
     if (tclEofChan && ret <= 0) {
 	dprintf("Got EOF while reading, returning a Connection Reset error which maps to Soft EOF");
 	Tcl_SetErrno(ECONNRESET);
 	ret = 0;
-
     } else if (ret == 0) {
 	dprintf("Got 0 from Tcl_Read or Tcl_ReadRaw, and EOF is not set; ret = 0");
 	dprintf("Setting retry read flag");
 	BIO_set_retry_read(bio);
-
     } else if (ret < 0) {
 	dprintf("We got some kind of I/O error");
 
 	if (tclErrno == EAGAIN) {
 	    dprintf("It's EAGAIN");
 	} else {
 	    dprintf("It's an unexpected error: %s/%i", Tcl_ErrnoMsg(tclErrno), tclErrno);
 	}
-
     } else {
 	dprintf("Successfully read %" TCL_SIZE_MODIFIER "d bytes of data", ret);
     }
 
     if (ret != -1 || (ret == -1 && tclErrno == EAGAIN)) {
@@ -112,34 +106,33 @@
 
 	    BIO_set_retry_write(bio);
 	}
     }
 
-    dprintf("BioRead(%p, <buf>, %d) [%p] returning %" TCL_SIZE_MODIFIER "d", (void *) bio,
-	bufLen, (void *) chan, ret);
+    dprintf("BioRead(%p, <buf>, %d) [%p] returning %" TCL_SIZE_MODIFIER "d",
+	    (void *)bio, bufLen, (void *) chan, ret);
 
-    return((int) ret);
+    return (int)ret;
 }
 
 static int BioPuts(BIO *bio, const char *str) {
     dprintf("BioPuts(%p, <string:%p>) called", bio, str);
 
-    return(BioWrite(bio, str, (int) strlen(str)));
+    return BioWrite(bio, str, (int) strlen(str));
 }
 
 static long BioCtrl(BIO *bio, int cmd, long num, void *ptr) {
     Tcl_Channel chan;
     long ret = 1;
 
     chan = Tls_GetParent((State *) BIO_get_data(bio), 0);
 
-    dprintf("BioCtrl(%p, 0x%x, 0x%lx, %p)", (void *) bio, cmd, num, ptr);
+    dprintf("BioCtrl(%p, 0x%x, 0x%lx, %p)", bio, cmd, num, ptr);
 
     switch (cmd) {
 	case BIO_CTRL_RESET:
 		dprintf("Got BIO_CTRL_RESET");
-		num = 0;
 		ret = 0;
 		break;
 	case BIO_C_FILE_SEEK:
 		dprintf("Got BIO_C_FILE_SEEK");
 		ret = 0;
@@ -217,23 +210,23 @@
 		ret = 0;
 		break;
 #endif
 	default:
 		dprintf("Got unknown control command (%i)", cmd);
-		ret = 0;
+		ret = -2;
 		break;
     }
-    return(ret);
+    return ret;
 }
 
 static int BioNew(BIO *bio) {
     dprintf("BioNew(%p) called", bio);
 
     BIO_set_init(bio, 0);
     BIO_set_data(bio, NULL);
     BIO_clear_flags(bio, -1);
-    return(1);
+    return 1;
 }
 
 static int BioFree(BIO *bio) {
     if (bio == NULL) {
 	return(0);
@@ -248,11 +241,11 @@
 	}
 
 	BIO_set_init(bio, 0);
 	BIO_clear_flags(bio, -1);
     }
-    return(1);
+    return 1;
 }
 
 BIO *BIO_new_tcl(State *statePtr, int flags) {
     BIO *bio;
     static BIO_METHOD *BioMethods = NULL;