@@ -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.3 2000/07/27 01:58:18 hobbs Exp $
+ * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsBIO.c,v 1.4 2000/08/15 00:02:08 hobbs Exp $
  *
  * Provides BIO layer to interface openssl to Tcl.
  */
 
 #include "tlsInt.h"
@@ -61,15 +61,15 @@
     Tcl_Channel chan = Tls_GetParent((State*)(bio->ptr));
     int ret;
 
     dprintf(stderr,"\nBioWrite(0x%x, <buf>, %d) [0x%x]", bio, bufLen, chan);
 
-#ifdef TCL_CHANNEL_VERSION_2
-    ret = Tcl_WriteRaw(chan, buf, bufLen);
-#else
-    ret = Tcl_Write(chan, buf, bufLen);
-#endif
+    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());
 
     BIO_clear_flags(bio, BIO_FLAGS_WRITE|BIO_FLAGS_SHOULD_RETRY);
@@ -97,15 +97,15 @@
 
     dprintf(stderr,"\nBioRead(0x%x, <buf>, %d) [0x%x]", bio, bufLen, chan);
 
     if (buf == NULL) return 0;
 
-#ifdef TCL_CHANNEL_VERSION_2
-    ret = Tcl_ReadRaw(chan, buf, bufLen);
-#else
-    ret = Tcl_Read(chan, buf, bufLen);
-#endif
+    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());
 
     BIO_clear_flags(bio, BIO_FLAGS_READ|BIO_FLAGS_SHOULD_RETRY);
@@ -190,20 +190,14 @@
 	break;
     case BIO_CTRL_DUP:
 	break;
     case BIO_CTRL_FLUSH:
 	dprintf(stderr, "BIO_CTRL_FLUSH\n");
-	if (
-#ifdef TCL_CHANNEL_VERSION_2
-	    Tcl_WriteRaw(chan, "", 0) >= 0
-#else
-	    Tcl_Flush(chan) == TCL_OK
-#endif
-	    ) {
-	    ret = 1;
+	if (channelTypeVersion == TLS_CHANNEL_VERSION_2) {
+	    ret = ((Tcl_WriteRaw(chan, "", 0) >= 0) ? 1 : -1);
 	} else {
-	    ret = -1;
+	    ret = ((Tcl_Flush(chan) == TCL_OK) ? 1 : -1);
 	}
 	break;
     default:
 	ret = 0;
 	break;