Delete the unnecessary ERR and ERRC lines in makefiles, add some functionality

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

diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c
index ecdd1709d1779eaee7e5f43ad3aa3fea9b75b089..083d1b584c63e5b121f07db0a0fd6278944da74a 100644 (file)
--- a/crypto/bio/bss_acpt.c
+++ b/crypto/bio/bss_acpt.c
@@ -62,7 +62,7 @@
 #include <errno.h>
 #define USE_SOCKETS
 #include "cryptlib.h"
-#include "bio.h"
+#include <openssl/bio.h>
 
 /*     BIOerr(BIO_F_WSASTARTUP,BIO_R_WSASTARTUP ); */
 
@@ -136,13 +136,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 +156,7 @@ BIO *bi;
        return(1);
        }
 
-BIO_ACCEPT *BIO_ACCEPT_new()
+BIO_ACCEPT *BIO_ACCEPT_new(void)
        {
        BIO_ACCEPT *ret;
 
@@ -170,8 +169,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 +180,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 +194,7 @@ BIO *bio;
                }
        }
 
-static int acpt_free(a)
-BIO *a;
+static int acpt_free(BIO *a)
        {
        BIO_ACCEPT *data;
 
@@ -216,9 +212,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,10 +303,7 @@ 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;
@@ -331,10 +322,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 +341,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 +455,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 +464,7 @@ char *str;
        return(ret);
        }
 
-BIO *BIO_new_accept(str)
-char *str;
+BIO *BIO_new_accept(char *str)
        {
        BIO *ret;