@@ -1,9 +1,9 @@ /* * Copyright (C) 1997-2000 Matt Newman * - * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsBIO.c,v 1.2.2.2 2000/07/12 01:54:26 hobbs Exp $ + * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsBIO.c,v 1.2.2.3 2000/07/21 05:32:57 hobbs Exp $ * * Provides BIO layer to interface openssl to Tcl. */ #include "tlsInt.h" @@ -152,42 +152,41 @@ ret = 1; break; case BIO_C_SET_FD: BioFree(bio); /* Sets State* */ - bio->ptr = *((char **)ptr); - bio->shutdown = (int)num; - bio->init = 1; + bio->ptr = *((char **)ptr); + bio->shutdown = (int)num; + bio->init = 1; break; case BIO_C_GET_FD: if (bio->init) { - ip=(int *)ptr; - if (ip != NULL) *ip=bio->num; - ret=bio->num; + ip = (int *)ptr; + if (ip != NULL) { + *ip = bio->num; + } + ret = bio->num; } else { - ret= -1; + ret = -1; } break; case BIO_CTRL_GET_CLOSE: - ret=bio->shutdown; + ret = bio->shutdown; break; case BIO_CTRL_SET_CLOSE: - bio->shutdown=(int)num; + bio->shutdown = (int)num; break; case BIO_CTRL_EOF: dprintf(stderr, "BIO_CTRL_EOF\n"); ret = Tcl_Eof( chan); break; case BIO_CTRL_PENDING: - if (Tcl_InputBuffered(chan)) - ret = 1; - else - ret = 0; + ret = (Tcl_InputBuffered(chan) ? 1 : 0); dprintf(stderr, "BIO_CTRL_PENDING(%d)\n", ret); break; case BIO_CTRL_WPENDING: - ret=0; + ret = 0; break; case BIO_CTRL_DUP: break; case BIO_CTRL_FLUSH: dprintf(stderr, "BIO_CTRL_FLUSH\n"); @@ -212,31 +211,32 @@ static int BioNew (bio) BIO *bio; { - bio->init = 0; - bio->num = 0; - bio->ptr = NULL; - bio->flags = 0; + bio->init = 0; + bio->num = 0; + bio->ptr = NULL; + bio->flags = 0; return 1; } static int BioFree (bio) BIO *bio; { - if (bio == NULL) + if (bio == NULL) { return 0; + } if (bio->shutdown) { if (bio->init) { /*shutdown(bio->num, 2) */ /*closesocket(bio->num) */ } - bio->init = 0; - bio->flags = 0; - bio->num = 0; + bio->init = 0; + bio->flags = 0; + bio->num = 0; } return 1; }