diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-12-15 19:33:48 +0100 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-12-15 19:33:48 +0100 |
| commit | fce78bd4ede74d4fa7bd1c8195d8f7bc9403bd4c (patch) | |
| tree | 47178f4d920c5fc4af3c91ee8c20ec6b8312cf96 /include | |
| parent | d016d1ec34977fa9305ad5d535b03d6c5677cf1c (diff) | |
Fix invalid function type casts.
Rename bio_info_cb to BIO_info_cb.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4493)
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/bio.h | 2 | ||||
| -rw-r--r-- | include/openssl/bio.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/internal/bio.h b/include/internal/bio.h index f02d74115f..4428947f2d 100644 --- a/include/internal/bio.h +++ b/include/internal/bio.h @@ -21,7 +21,7 @@ struct bio_method_st { long (*ctrl) (BIO *, int, long, void *); int (*create) (BIO *); int (*destroy) (BIO *); - long (*callback_ctrl) (BIO *, int, bio_info_cb *); + long (*callback_ctrl) (BIO *, int, BIO_info_cb *); }; void bio_free_ex_data(BIO *bio); diff --git a/include/openssl/bio.h b/include/openssl/bio.h index 75aa88442c..54a833c275 100644 --- a/include/openssl/bio.h +++ b/include/openssl/bio.h @@ -255,7 +255,8 @@ 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(BIO *, int, const char *, int, long, long); +typedef int BIO_info_cb(BIO *, int, int); +typedef BIO_info_cb bio_info_cb; /* backward compatibility */ DEFINE_STACK_OF(BIO) @@ -566,8 +567,7 @@ int BIO_write_ex(BIO *b, const void *data, size_t dlen, size_t *written); 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) (BIO *, int, const char *, int, long, long)); +long BIO_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp); 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); @@ -785,10 +785,10 @@ int BIO_meth_set_create(BIO_METHOD *biom, int (*create) (BIO *)); int (*BIO_meth_get_destroy(BIO_METHOD *biom)) (BIO *); int BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy) (BIO *)); long (*BIO_meth_get_callback_ctrl(BIO_METHOD *biom)) - (BIO *, int, bio_info_cb *); + (BIO *, int, BIO_info_cb *); int BIO_meth_set_callback_ctrl(BIO_METHOD *biom, long (*callback_ctrl) (BIO *, int, - bio_info_cb *)); + BIO_info_cb *)); int ERR_load_BIO_strings(void); # ifdef __cplusplus |