From: Richard Levitte Date: Fri, 29 Apr 2016 16:57:58 +0000 (+0200) Subject: Change 'struct bio_st' in all public header where applicable X-Git-Tag: OpenSSL_1_1_0-pre6~985 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=83f2695c318613cb22e11e8c5e5a7c9d89ceff56;p=openssl Change 'struct bio_st' in all public header where applicable Reviewed-by: Rich Salz --- diff --git a/include/openssl/bio.h b/include/openssl/bio.h index 42468b00ef..03a6f04c75 100644 --- a/include/openssl/bio.h +++ b/include/openssl/bio.h @@ -284,10 +284,10 @@ void BIO_clear_flags(BIO *b, int flags); # define BIO_cb_pre(a) (!((a)&BIO_CB_RETURN)) # define BIO_cb_post(a) ((a)&BIO_CB_RETURN) -long (*BIO_get_callback(const BIO *b)) (struct bio_st *, int, const char *, +long (*BIO_get_callback(const BIO *b)) (BIO *, int, const char *, int, long, long); void BIO_set_callback(BIO *b, - long (*callback) (struct bio_st *, int, const char *, + long (*callback) (BIO *, int, const char *, int, long, long)); char *BIO_get_callback_arg(const BIO *b); void BIO_set_callback_arg(BIO *b, char *arg); @@ -297,7 +297,7 @@ typedef struct bio_method_st BIO_METHOD; const char *BIO_method_name(const BIO *b); int BIO_method_type(const BIO *b); -typedef void bio_info_cb (struct bio_st *, int, const char *, int, long, +typedef void bio_info_cb (BIO *, int, const char *, int, long, long); DEFINE_STACK_OF(BIO) @@ -601,8 +601,7 @@ int BIO_puts(BIO *bp, const char *buf); int BIO_indent(BIO *b, int indent, int max); long BIO_ctrl(BIO *bp, int cmd, long larg, void *parg); long BIO_callback_ctrl(BIO *b, int cmd, - void (*fp) (struct bio_st *, int, const char *, int, - long, long)); + void (*fp) (BIO *, int, const char *, int, long, long)); void *BIO_ptr_ctrl(BIO *bp, int cmd, long larg); long BIO_int_ctrl(BIO *bp, int cmd, long larg, int iarg); BIO *BIO_push(BIO *b, BIO *append);