summaryrefslogtreecommitdiffstats
path: root/crypto/bio/bf_null.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-01-31 15:24:24 +0100
committerRichard Levitte <levitte@openssl.org>2018-01-31 17:45:11 +0100
commit94f1c9379c3ed4b088718b35d0dd807d619d50c5 (patch)
tree298ddf803baf0e7b32e3741618f01610ab8e60c4 /crypto/bio/bf_null.c
parent7f55808fe723c146428415a470ed42331548007b (diff)
Remove "dummy" BIO create and destroy functions
They aren't needed if all they do is set bio->init = 1 and zero other fields that are already zeroed Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5223)
Diffstat (limited to 'crypto/bio/bf_null.c')
-rw-r--r--crypto/bio/bf_null.c26
1 files changed, 2 insertions, 24 deletions
diff --git a/crypto/bio/bf_null.c b/crypto/bio/bf_null.c
index df4e51133f..8e62832eb7 100644
--- a/crypto/bio/bf_null.c
+++ b/crypto/bio/bf_null.c
@@ -21,8 +21,6 @@ static int nullf_read(BIO *h, char *buf, int size);
static int nullf_puts(BIO *h, const char *str);
static int nullf_gets(BIO *h, char *str, int size);
static long nullf_ctrl(BIO *h, int cmd, long arg1, void *arg2);
-static int nullf_new(BIO *h);
-static int nullf_free(BIO *data);
static long nullf_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp);
static const BIO_METHOD methods_nullf = {
BIO_TYPE_NULL_FILTER,
@@ -36,8 +34,8 @@ static const BIO_METHOD methods_nullf = {
nullf_puts,
nullf_gets,
nullf_ctrl,
- nullf_new,
- nullf_free,
+ NULL,
+ NULL,
nullf_callback_ctrl,
};
@@ -46,26 +44,6 @@ const BIO_METHOD *BIO_f_null(void)
return &methods_nullf;
}
-static int nullf_new(BIO *bi)
-{
- bi->init = 1;
- bi->ptr = NULL;
- bi->flags = 0;
- return 1;
-}
-
-static int nullf_free(BIO *a)
-{
- if (a == NULL)
- return 0;
- /*-
- a->ptr=NULL;
- a->init=0;
- a->flags=0;
- */
- return 1;
-}
-
static int nullf_read(BIO *b, char *out, int outl)
{
int ret = 0;