From de8f24ea083384bb66b32ec105dc4743c5663cdf Mon Sep 17 00:00:00 2001
From: beck <>
Date: Wed, 29 Sep 1999 04:37:45 +0000
Subject: OpenSSL 0.9.4 merge

---
 src/lib/libcrypto/bio/bss_null.c | 46 ++++++++--------------------------------
 1 file changed, 9 insertions(+), 37 deletions(-)

(limited to 'src/lib/libcrypto/bio/bss_null.c')

diff --git a/src/lib/libcrypto/bio/bss_null.c b/src/lib/libcrypto/bio/bss_null.c
index 0791a2471a..d04be888e5 100644
--- a/src/lib/libcrypto/bio/bss_null.c
+++ b/src/lib/libcrypto/bio/bss_null.c
@@ -59,9 +59,8 @@
 #include <stdio.h>
 #include <errno.h>
 #include "cryptlib.h"
-#include "bio.h"
+#include <openssl/bio.h>
 
-#ifndef NOPROTO
 static int null_write(BIO *h,char *buf,int num);
 static int null_read(BIO *h,char *buf,int size);
 static int null_puts(BIO *h,char *str);
@@ -69,16 +68,6 @@ static int null_gets(BIO *h,char *str,int size);
 static long null_ctrl(BIO *h,int cmd,long arg1,char *arg2);
 static int null_new(BIO *h);
 static int null_free(BIO *data);
-#else
-static int null_write();
-static int null_read();
-static int null_puts();
-static int null_gets();
-static long null_ctrl();
-static int null_new();
-static int null_free();
-#endif
-
 static BIO_METHOD null_method=
 	{
 	BIO_TYPE_NULL,
@@ -92,13 +81,12 @@ static BIO_METHOD null_method=
 	null_free,
 	};
 
-BIO_METHOD *BIO_s_null()
+BIO_METHOD *BIO_s_null(void)
 	{
 	return(&null_method);
 	}
 
-static int null_new(bi)
-BIO *bi;
+static int null_new(BIO *bi)
 	{
 	bi->init=1;
 	bi->num=0;
@@ -106,34 +94,23 @@ BIO *bi;
 	return(1);
 	}
 
-static int null_free(a)
-BIO *a;
+static int null_free(BIO *a)
 	{
 	if (a == NULL) return(0);
 	return(1);
 	}
 	
-static int null_read(b,out,outl)
-BIO *b;
-char *out;
-int outl;
+static int null_read(BIO *b, char *out, int outl)
 	{
 	return(0);
 	}
 
-static int null_write(b,in,inl)
-BIO *b;
-char *in;
-int inl;
+static int null_write(BIO *b, char *in, int inl)
 	{
 	return(inl);
 	}
 
-static long null_ctrl(b,cmd,num,ptr)
-BIO *b;
-int cmd;
-long num;
-char *ptr;
+static long null_ctrl(BIO *b, int cmd, long num, char *ptr)
 	{
 	long ret=1;
 
@@ -159,17 +136,12 @@ char *ptr;
 	return(ret);
 	}
 
-static int null_gets(bp,buf,size)
-BIO *bp;
-char *buf;
-int size;
+static int null_gets(BIO *bp, char *buf, int size)
 	{
 	return(0);
 	}
 
-static int null_puts(bp,str)
-BIO *bp;
-char *str;
+static int null_puts(BIO *bp, char *str)
 	{
 	if (str == NULL) return(0);
 	return(strlen(str));
-- 
cgit v1.2.3-55-g6feb