projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy up CRYPTO_EX_DATA structures.
[oweals/openssl.git]
/
crypto
/
bio
/
bf_null.c
diff --git
a/crypto/bio/bf_null.c
b/crypto/bio/bf_null.c
index 9864f4a03cc500cad58d47da24a3d2bd94d681d8..3254a55dce7fcf213e822f24f3b2f752b5d92906 100644
(file)
--- a/
crypto/bio/bf_null.c
+++ b/
crypto/bio/bf_null.c
@@
-1,5
+1,5
@@
/* crypto/bio/bf_null.c */
/* crypto/bio/bf_null.c */
-/* Copyright (C) 1995-199
7
Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-199
8
Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
* This package is an SSL implementation written
* All rights reserved.
*
* This package is an SSL implementation written
@@
-59,13
+59,12
@@
#include <stdio.h>
#include <errno.h>
#include "cryptlib.h"
#include <stdio.h>
#include <errno.h>
#include "cryptlib.h"
-#include
"bio.h"
-#include
"evp.h"
+#include
<openssl/bio.h>
+#include
<openssl/evp.h>
/* BIO_put and BIO_get both add to the digest,
* BIO_gets returns the digest */
/* BIO_put and BIO_get both add to the digest,
* BIO_gets returns the digest */
-#ifndef NOPROTO
static int nullf_write(BIO *h,char *buf,int num);
static int nullf_read(BIO *h,char *buf,int size);
static int nullf_puts(BIO *h,char *str);
static int nullf_write(BIO *h,char *buf,int num);
static int nullf_read(BIO *h,char *buf,int size);
static int nullf_puts(BIO *h,char *str);
@@
-73,19
+72,10
@@
static int nullf_gets(BIO *h,char *str,int size);
static long nullf_ctrl(BIO *h,int cmd,long arg1,char *arg2);
static int nullf_new(BIO *h);
static int nullf_free(BIO *data);
static long nullf_ctrl(BIO *h,int cmd,long arg1,char *arg2);
static int nullf_new(BIO *h);
static int nullf_free(BIO *data);
-#else
-static int nullf_write();
-static int nullf_read();
-static int nullf_puts();
-static int nullf_gets();
-static long nullf_ctrl();
-static int nullf_new();
-static int nullf_free();
-#endif
-
static BIO_METHOD methods_nullf=
{
static BIO_METHOD methods_nullf=
{
- BIO_TYPE_NULL_FILTER,"NULL filter",
+ BIO_TYPE_NULL_FILTER,
+ "NULL filter",
nullf_write,
nullf_read,
nullf_puts,
nullf_write,
nullf_read,
nullf_puts,
@@
-95,13
+85,12
@@
static BIO_METHOD methods_nullf=
nullf_free,
};
nullf_free,
};
-BIO_METHOD *BIO_f_null()
+BIO_METHOD *BIO_f_null(
void
)
{
return(&methods_nullf);
}
{
return(&methods_nullf);
}
-static int nullf_new(bi)
-BIO *bi;
+static int nullf_new(BIO *bi)
{
bi->init=1;
bi->ptr=NULL;
{
bi->init=1;
bi->ptr=NULL;
@@
-109,8
+98,7
@@
BIO *bi;
return(1);
}
return(1);
}
-static int nullf_free(a)
-BIO *a;
+static int nullf_free(BIO *a)
{
if (a == NULL) return(0);
/* a->ptr=NULL;
{
if (a == NULL) return(0);
/* a->ptr=NULL;
@@
-119,10
+107,7
@@
BIO *a;
return(1);
}
return(1);
}
-static int nullf_read(b,out,outl)
-BIO *b;
-char *out;
-int outl;
+static int nullf_read(BIO *b, char *out, int outl)
{
int ret=0;
{
int ret=0;
@@
-134,10
+119,7
@@
int outl;
return(ret);
}
return(ret);
}
-static int nullf_write(b,in,inl)
-BIO *b;
-char *in;
-int inl;
+static int nullf_write(BIO *b, char *in, int inl)
{
int ret=0;
{
int ret=0;
@@
-149,11
+131,7
@@
int inl;
return(ret);
}
return(ret);
}
-static long nullf_ctrl(b,cmd,num,ptr)
-BIO *b;
-int cmd;
-long num;
-char *ptr;
+static long nullf_ctrl(BIO *b, int cmd, long num, char *ptr)
{
long ret;
{
long ret;
@@
-166,6
+144,7
@@
char *ptr;
BIO_copy_next_retry(b);
break;
case BIO_CTRL_DUP:
BIO_copy_next_retry(b);
break;
case BIO_CTRL_DUP:
+ ret=0L;
break;
default:
ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
break;
default:
ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
@@
-173,19
+152,14
@@
char *ptr;
return(ret);
}
return(ret);
}
-static int nullf_gets(bp,buf,size)
-BIO *bp;
-char *buf;
-int size;
+static int nullf_gets(BIO *bp, char *buf, int size)
{
if (bp->next_bio == NULL) return(0);
return(BIO_gets(bp->next_bio,buf,size));
}
{
if (bp->next_bio == NULL) return(0);
return(BIO_gets(bp->next_bio,buf,size));
}
-static int nullf_puts(bp,str)
-BIO *bp;
-char *str;
+static int nullf_puts(BIO *bp, char *str)
{
if (bp->next_bio == NULL) return(0);
return(BIO_puts(bp->next_bio,str));
{
if (bp->next_bio == NULL) return(0);
return(BIO_puts(bp->next_bio,str));