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 /doc | |
parent | d016d1ec34977fa9305ad5d535b03d6c5677cf1c (diff) | |
download | openssl-new-fce78bd4ede74d4fa7bd1c8195d8f7bc9403bd4c.tar.gz |
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 'doc')
-rw-r--r-- | doc/man3/BIO_ctrl.pod | 11 | ||||
-rw-r--r-- | doc/man3/BIO_meth_new.pod | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/doc/man3/BIO_ctrl.pod b/doc/man3/BIO_ctrl.pod index 5aef75a82b..60cd10883b 100644 --- a/doc/man3/BIO_ctrl.pod +++ b/doc/man3/BIO_ctrl.pod @@ -5,18 +5,17 @@ BIO_ctrl, BIO_callback_ctrl, BIO_ptr_ctrl, BIO_int_ctrl, BIO_reset, BIO_seek, BIO_tell, BIO_flush, BIO_eof, BIO_set_close, BIO_get_close, BIO_pending, BIO_wpending, BIO_ctrl_pending, BIO_ctrl_wpending, -BIO_get_info_callback, BIO_set_info_callback, bio_info_cb +BIO_get_info_callback, BIO_set_info_callback, BIO_info_cb - BIO control operations =head1 SYNOPSIS #include <openssl/bio.h> - typedef void bio_info_cb(BIO *b, int oper, const char *ptr, - int arg1, long arg2, long arg3); + typedef int BIO_info_cb(BIO *b, int state, int res); long BIO_ctrl(BIO *bp, int cmd, long larg, void *parg); - long BIO_callback_ctrl(BIO *b, int cmd, bio_info_cb *cb); + long BIO_callback_ctrl(BIO *b, int cmd, BIO_info_cb *cb); char *BIO_ptr_ctrl(BIO *bp, int cmd, long larg); long BIO_int_ctrl(BIO *bp, int cmd, long larg, int iarg); @@ -32,8 +31,8 @@ BIO_get_info_callback, BIO_set_info_callback, bio_info_cb size_t BIO_ctrl_pending(BIO *b); size_t BIO_ctrl_wpending(BIO *b); - int BIO_get_info_callback(BIO *b, bio_info_cb **cbp); - int BIO_set_info_callback(BIO *b, bio_info_cb *cb); + int BIO_get_info_callback(BIO *b, BIO_info_cb **cbp); + int BIO_set_info_callback(BIO *b, BIO_info_cb *cb); =head1 DESCRIPTION diff --git a/doc/man3/BIO_meth_new.pod b/doc/man3/BIO_meth_new.pod index 5617d099f2..c86568365e 100644 --- a/doc/man3/BIO_meth_new.pod +++ b/doc/man3/BIO_meth_new.pod @@ -52,9 +52,9 @@ BIO_meth_set_callback_ctrl - Routines to build up BIO methods 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 *); + long (*BIO_meth_get_callback_ctrl(BIO_METHOD *biom))(BIO *, int, BIO_info_cb *); int BIO_meth_set_callback_ctrl(BIO_METHOD *biom, - long (*callback_ctrl)(BIO *, int, bio_info_cb *)); + long (*callback_ctrl)(BIO *, int, BIO_info_cb *)); =head1 DESCRIPTION |