提交 94f1c937 编写于 作者: R Richard Levitte

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: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5223)
上级 7f55808f
......@@ -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;
......
......@@ -17,8 +17,6 @@ static int null_read(BIO *h, char *buf, int size);
static int null_puts(BIO *h, const char *str);
static int null_gets(BIO *h, char *str, int size);
static long null_ctrl(BIO *h, int cmd, long arg1, void *arg2);
static int null_new(BIO *h);
static int null_free(BIO *data);
static const BIO_METHOD null_method = {
BIO_TYPE_NULL,
"NULL",
......@@ -31,8 +29,8 @@ static const BIO_METHOD null_method = {
null_puts,
null_gets,
null_ctrl,
null_new,
null_free,
NULL,
NULL,
NULL, /* null_callback_ctrl */
};
......@@ -41,21 +39,6 @@ const BIO_METHOD *BIO_s_null(void)
return &null_method;
}
static int null_new(BIO *bi)
{
bi->init = 1;
bi->num = 0;
bi->ptr = (NULL);
return 1;
}
static int null_free(BIO *a)
{
if (a == NULL)
return 0;
return 1;
}
static int null_read(BIO *b, char *out, int outl)
{
return 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册