First pass at applying KNF to the OpenSSL code, which almost makes it

readable. This pass is whitespace only and can readily be verified using
tr and md5.

1 files changed, 112 insertions, 109 deletions

diff --git a/src/lib/libcrypto/bio/bss_fd.c b/src/lib/libcrypto/bio/bss_fd.c
index ab18a56310..35ddd61359 100644
--- a/src/lib/libcrypto/bio/bss_fd.c
+++ b/src/lib/libcrypto/bio/bss_fd.c
@@ -90,9 +90,8 @@ static int fd_new(BIO *h);
 static int fd_free(BIO *data);
 int BIO_fd_should_retry(int s);
 
-static BIO_METHOD methods_fdp=
-        {
-        BIO_TYPE_FD,"file descriptor",
+static BIO_METHOD methods_fdp = {
+        BIO_TYPE_FD, "file descriptor",
         fd_write,
         fd_read,
         fd_puts,
@@ -101,178 +100,182 @@ static BIO_METHOD methods_fdp=
         fd_new,
         fd_free,
         NULL,
-        };
+};
 
-BIO_METHOD *BIO_s_fd(void)
-        {
-        return(&methods_fdp);
-        }
+BIO_METHOD
+*BIO_s_fd(void)
+{
+        return (&methods_fdp);
+}
 
-BIO *BIO_new_fd(int fd,int close_flag)
-        {
+BIO
+*BIO_new_fd(int fd, int close_flag)
+{
         BIO *ret;
-        ret=BIO_new(BIO_s_fd());
-        if (ret == NULL) return(NULL);
-        BIO_set_fd(ret,fd,close_flag);
-        return(ret);
-        }
+        ret = BIO_new(BIO_s_fd());
+        if (ret == NULL)
+                return (NULL);
+        BIO_set_fd(ret, fd, close_flag);
+        return (ret);
+}
 
-static int fd_new(BIO *bi)
-        {
-        bi->init=0;
-        bi->num=-1;
-        bi->ptr=NULL;
+static int
+fd_new(BIO *bi)
+{
+        bi->init = 0;
+        bi->num = -1;
+        bi->ptr = NULL;
         bi->flags=BIO_FLAGS_UPLINK; /* essentially redundant */
-        return(1);
-        }
+        return (1);
+}
 
-static int fd_free(BIO *a)
-        {
-        if (a == NULL) return(0);
-        if (a->shutdown)
-                {
-                if (a->init)
-                        {
+static int
+fd_free(BIO *a)
+{
+        if (a == NULL)
+                return (0);
+        if (a->shutdown) {
+                if (a->init) {
                         UP_close(a->num);
-                        }
-                a->init=0;
-                a->flags=BIO_FLAGS_UPLINK;
                 }
-        return(1);
+                a->init = 0;
+                a->flags = BIO_FLAGS_UPLINK;
         }
-        
-static int fd_read(BIO *b, char *out,int outl)
-        {
-        int ret=0;
+        return (1);
+}
 
-        if (out != NULL)
-                {
+static int
+fd_read(BIO *b, char *out, int outl)
+{
+        int ret = 0;
+
+        if (out != NULL) {
                 errno = 0;
-                ret=UP_read(b->num,out,outl);
+                ret = UP_read(b->num, out, outl);
                 BIO_clear_retry_flags(b);
-                if (ret <= 0)
-                        {
+                if (ret <= 0) {
                         if (BIO_fd_should_retry(ret))
                                 BIO_set_retry_read(b);
-                        }
                 }
-        return(ret);
         }
+        return (ret);
+}
 
-static int fd_write(BIO *b, const char *in, int inl)
-        {
+static int
+fd_write(BIO *b, const char *in, int inl)
+{
         int ret;
         errno = 0;
-        ret=UP_write(b->num,in,inl);
+        ret = UP_write(b->num, in, inl);
         BIO_clear_retry_flags(b);
-        if (ret <= 0)
-                {
+        if (ret <= 0) {
                 if (BIO_fd_should_retry(ret))
                         BIO_set_retry_write(b);
-                }
-        return(ret);
         }
+        return (ret);
+}
 
-static long fd_ctrl(BIO *b, int cmd, long num, void *ptr)
-        {
-        long ret=1;
+static long
+fd_ctrl(BIO *b, int cmd, long num, void *ptr)
+{
+        long ret = 1;
         int *ip;
 
-        switch (cmd)
-                {
+        switch (cmd) {
         case BIO_CTRL_RESET:
-                num=0;
+                num = 0;
         case BIO_C_FILE_SEEK:
-                ret=(long)UP_lseek(b->num,num,0);
+                ret = (long)UP_lseek(b->num, num, 0);
                 break;
         case BIO_C_FILE_TELL:
         case BIO_CTRL_INFO:
-                ret=(long)UP_lseek(b->num,0,1);
+                ret = (long)UP_lseek(b->num, 0, 1);
                 break;
         case BIO_C_SET_FD:
                 fd_free(b);
                 b->num= *((int *)ptr);
-                b->shutdown=(int)num;
-                b->init=1;
+                b->shutdown = (int)num;
+                b->init = 1;
                 break;
         case BIO_C_GET_FD:
-                if (b->init)
-                        {
-                        ip=(int *)ptr;
-                        if (ip != NULL) *ip=b->num;
-                        ret=b->num;
-                        }
-                else
-                        ret= -1;
+                if (b->init) {
+                        ip = (int *)ptr;
+                        if (ip != NULL)
+                                *ip = b->num;
+                        ret = b->num;
+                } else
+                        ret = -1;
                 break;
         case BIO_CTRL_GET_CLOSE:
-                ret=b->shutdown;
+                ret = b->shutdown;
                 break;
         case BIO_CTRL_SET_CLOSE:
-                b->shutdown=(int)num;
+                b->shutdown = (int)num;
                 break;
         case BIO_CTRL_PENDING:
         case BIO_CTRL_WPENDING:
-                ret=0;
+                ret = 0;
                 break;
         case BIO_CTRL_DUP:
         case BIO_CTRL_FLUSH:
-                ret=1;
+                ret = 1;
                 break;
         default:
-                ret=0;
+                ret = 0;
                 break;
-                }
-        return(ret);
         }
+        return (ret);
+}
 
-static int fd_puts(BIO *bp, const char *str)
-        {
-        int n,ret;
+static int
+fd_puts(BIO *bp, const char *str)
+{
+        int n, ret;
 
-        n=strlen(str);
-        ret=fd_write(bp,str,n);
-        return(ret);
-        }
+        n = strlen(str);
+        ret = fd_write(bp, str, n);
+        return (ret);
+}
 
-static int fd_gets(BIO *bp, char *buf, int size)
-        {
-        int ret=0;
-        char *ptr=buf;
-        char *end=buf+size-1;
+static int
+fd_gets(BIO *bp, char *buf, int size)
+{
+        int ret = 0;
+        char *ptr = buf;
+        char *end = buf + size - 1;
 
-        while ( (ptr < end) && (fd_read(bp, ptr, 1) > 0) && (ptr[0] != '\n') )
+        while ((ptr < end) && (fd_read(bp, ptr, 1) > 0) && (ptr[0] != '\n'))
                 ptr++;
 
-        ptr[0]='\0';
+        ptr[0] = '\0';
 
         if (buf[0] != '\0')
-                ret=strlen(buf);
-        return(ret);
-        }
+                ret = strlen(buf);
+        return (ret);
+}
 
-int BIO_fd_should_retry(int i)
-        {
+int
+BIO_fd_should_retry(int i)
+{
         int err;
 
-        if ((i == 0) || (i == -1))
-                {
-                err=errno;
+        if ((i == 0) || (i == -1)) {
+                err = errno;
 
 #if defined(OPENSSL_SYS_WINDOWS) && 0 /* more microsoft stupidity? perhaps not? Ben 4/1/99 */
                 if ((i == -1) && (err == 0))
-                        return(1);
+                        return (1);
 #endif
 
-                return(BIO_fd_non_fatal_error(err));
-                }
-        return(0);
+                return (BIO_fd_non_fatal_error(err));
         }
+        return (0);
+}
 
-int BIO_fd_non_fatal_error(int err)
-        {
-        switch (err)
-                {
+int
+BIO_fd_non_fatal_error(int err)
+{
+        switch (err) {
 
 #ifdef EWOULDBLOCK
 # ifdef WSAEWOULDBLOCK
@@ -309,11 +312,11 @@ int BIO_fd_non_fatal_error(int err)
 #ifdef EALREADY
         case EALREADY:
 #endif
-                return(1);
+                return (1);
                 /* break; */
         default:
                 break;
-                }
-        return(0);
         }
+        return (0);
+}
 #endif