Commit 5200dbb7 authored by Bernd Edlinger's avatar Bernd Edlinger
Browse files

Fix invalid function type casts. 


Rename bio_info_cb to BIO_info_cb.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4943)
parent 48ad955f

crypto/asn1/bio_asn1.c

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static int asn1_bio_gets(BIO *h, char *str, int size); 
static long asn1_bio_ctrl(BIO *h, int cmd, long arg1, void *arg2);

static int asn1_bio_new(BIO *h);

static int asn1_bio_free(BIO *data);

static long asn1_bio_callback_ctrl(BIO *h, int cmd, bio_info_cb *fp);

static long asn1_bio_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp);



static int asn1_bio_init(BIO_ASN1_BUF_CTX *ctx, int size);

static int asn1_bio_flush_ex(BIO *b, BIO_ASN1_BUF_CTX *ctx,
@@ -301,7 +301,7 @@ static int asn1_bio_gets(BIO *b, char *str, int size) 
    return BIO_gets(next, str, size);

}



static long asn1_bio_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp)

static long asn1_bio_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)

{

    BIO *next = BIO_next(b);

    if (next == NULL)

crypto/bio/bf_buff.c

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ static int buffer_gets(BIO *h, char *str, int size); 
static long buffer_ctrl(BIO *h, int cmd, long arg1, void *arg2);

static int buffer_new(BIO *h);

static int buffer_free(BIO *data);

static long buffer_callback_ctrl(BIO *h, int cmd, bio_info_cb *fp);

static long buffer_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp);

#define DEFAULT_BUFFER_SIZE     4096



static const BIO_METHOD methods_buffer = {
@@ -388,7 +388,7 @@ static long buffer_ctrl(BIO *b, int cmd, long num, void *ptr) 
    return (0);

}



static long buffer_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp)

static long buffer_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)

{

    long ret = 1;

crypto/bio/bf_lbuf.c

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ static int linebuffer_gets(BIO *h, char *str, int size); 
static long linebuffer_ctrl(BIO *h, int cmd, long arg1, void *arg2);

static int linebuffer_new(BIO *h);

static int linebuffer_free(BIO *data);

static long linebuffer_callback_ctrl(BIO *h, int cmd, bio_info_cb *fp);

static long linebuffer_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp);



/* A 10k maximum should be enough for most purposes */

#define DEFAULT_LINEBUFFER_SIZE 1024*10
@@ -292,7 +292,7 @@ static long linebuffer_ctrl(BIO *b, int cmd, long num, void *ptr) 
    return (0);

}



static long linebuffer_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp)

static long linebuffer_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)

{

    long ret = 1;

crypto/bio/bf_nbio.c

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ static int nbiof_gets(BIO *h, char *str, int size); 
static long nbiof_ctrl(BIO *h, int cmd, long arg1, void *arg2);

static int nbiof_new(BIO *h);

static int nbiof_free(BIO *data);

static long nbiof_callback_ctrl(BIO *h, int cmd, bio_info_cb *fp);

static long nbiof_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp);

typedef struct nbio_test_st {

    /* only set if we sent a 'should retry' error */

    int lrn;
@@ -165,7 +165,7 @@ static long nbiof_ctrl(BIO *b, int cmd, long num, void *ptr) 
    return (ret);

}



static long nbiof_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp)

static long nbiof_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)

{

    long ret = 1;

crypto/bio/bf_null.c

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 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 long nullf_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp);

static const BIO_METHOD methods_nullf = {

    BIO_TYPE_NULL_FILTER,

    "NULL filter",
@@ -111,7 +111,7 @@ static long nullf_ctrl(BIO *b, int cmd, long num, void *ptr) 
    return (ret);

}



static long nullf_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp)

static long nullf_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)

{

    long ret = 1;