Survive pedanticism.

[oweals/openssl.git] / crypto / bio / bss_acpt.c

diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c
index ecdd1709d1779eaee7e5f43ad3aa3fea9b75b089..47af80f76d51d2976f88952b908b1300dbb2af06 100644 (file)
--- a/crypto/bio/bss_acpt.c
+++ b/crypto/bio/bss_acpt.c
@@ -62,9 +62,7 @@
 #include <errno.h>
 #define USE_SOCKETS
 #include "cryptlib.h"
-#include "bio.h"
-
-/*     BIOerr(BIO_F_WSASTARTUP,BIO_R_WSASTARTUP ); */
+#include <openssl/bio.h>
 
 #ifdef WIN16
 #define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
@@ -72,6 +70,11 @@
 #define SOCKET_PROTOCOL IPPROTO_TCP
 #endif
 
+#if (defined(VMS) && __VMS_VER < 70000000)
+/* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
+#undef FIONBIO
+#endif
+
 typedef struct bio_accept_st
        {
        int state;
@@ -89,36 +92,17 @@ typedef struct bio_accept_st
        BIO *bio_chain;
        } BIO_ACCEPT;
 
-#ifndef NOPROTO
 static int acpt_write(BIO *h,char *buf,int num);
 static int acpt_read(BIO *h,char *buf,int size);
 static int acpt_puts(BIO *h,char *str);
 static long acpt_ctrl(BIO *h,int cmd,long arg1,char *arg2);
 static int acpt_new(BIO *h);
 static int acpt_free(BIO *data);
-#else
-static int acpt_write();
-static int acpt_read();
-static int acpt_puts();
-static long acpt_ctrl();
-static int acpt_new();
-static int acpt_free();
-#endif
-
-#ifndef NOPROTO
 static int acpt_state(BIO *b, BIO_ACCEPT *c);
 static void acpt_close_socket(BIO *data);
 BIO_ACCEPT *BIO_ACCEPT_new(void );
 void BIO_ACCEPT_free(BIO_ACCEPT *a);
 
-#else
-
-static int acpt_state();
-static void acpt_close_socket();
-BIO_ACCEPT *BIO_ACCEPT_new();
-void BIO_ACCEPT_free();
-#endif
-
 #define ACPT_S_BEFORE                  1
 #define ACPT_S_GET_ACCEPT_SOCKET       2
 #define ACPT_S_OK                      3
@@ -136,13 +120,12 @@ static BIO_METHOD methods_acceptp=
        acpt_free,
        };
 
-BIO_METHOD *BIO_s_accept()
+BIO_METHOD *BIO_s_accept(void)
        {
        return(&methods_acceptp);
        }
 
-static int acpt_new(bi)
-BIO *bi;
+static int acpt_new(BIO *bi)
        {
        BIO_ACCEPT *ba;
 
@@ -157,7 +140,7 @@ BIO *bi;
        return(1);
        }
 
-BIO_ACCEPT *BIO_ACCEPT_new()
+BIO_ACCEPT *BIO_ACCEPT_new(void)
        {
        BIO_ACCEPT *ret;
 
@@ -170,8 +153,7 @@ BIO_ACCEPT *BIO_ACCEPT_new()
        return(ret);
        }
 
-void BIO_ACCEPT_free(a)
-BIO_ACCEPT *a;
+void BIO_ACCEPT_free(BIO_ACCEPT *a)
        {
        if(a == NULL)
            return;
@@ -182,8 +164,7 @@ BIO_ACCEPT *a;
        Free(a);
        }
 
-static void acpt_close_socket(bio)
-BIO *bio;
+static void acpt_close_socket(BIO *bio)
        {
        BIO_ACCEPT *c;
 
@@ -197,8 +178,7 @@ BIO *bio;
                }
        }
 
-static int acpt_free(a)
-BIO *a;
+static int acpt_free(BIO *a)
        {
        BIO_ACCEPT *data;
 
@@ -216,9 +196,7 @@ BIO *a;
        return(1);
        }
        
-static int acpt_state(b,c)
-BIO *b;
-BIO_ACCEPT *c;
+static int acpt_state(BIO *b, BIO_ACCEPT *c)
        {
        BIO *bio=NULL,*dbio;
        int s= -1;
@@ -309,15 +287,12 @@ err:
 
        }
 
-static int acpt_read(b,out,outl)
-BIO *b;
-char *out;
-int outl;
+static int acpt_read(BIO *b, char *out, int outl)
        {
        int ret=0;
        BIO_ACCEPT *data;
 
-        BIO_clear_retry_flags(b);
+       BIO_clear_retry_flags(b);
        data=(BIO_ACCEPT *)b->ptr;
 
        while (b->next_bio == NULL)
@@ -331,10 +306,7 @@ int outl;
        return(ret);
        }
 
-static int acpt_write(b,in,inl)
-BIO *b;
-char *in;
-int inl;
+static int acpt_write(BIO *b, char *in, int inl)
        {
        int ret;
        BIO_ACCEPT *data;
@@ -353,11 +325,7 @@ int inl;
        return(ret);
        }
 
-static long acpt_ctrl(b,cmd,num,ptr)
-BIO *b;
-int cmd;
-long num;
-char *ptr;
+static long acpt_ctrl(BIO *b, int cmd, long num, char *ptr)
        {
        BIO *dbio;
        int *ip;
@@ -471,9 +439,7 @@ char *ptr;
        return(ret);
        }
 
-static int acpt_puts(bp,str)
-BIO *bp;
-char *str;
+static int acpt_puts(BIO *bp, char *str)
        {
        int n,ret;
 
@@ -482,8 +448,7 @@ char *str;
        return(ret);
        }
 
-BIO *BIO_new_accept(str)
-char *str;
+BIO *BIO_new_accept(char *str)
        {
        BIO *ret;