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 /test | |
| 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 'test')
| -rw-r--r-- | test/ossl_shim/async_bio.cc | 6 | ||||
| -rw-r--r-- | test/ossl_shim/packeted_bio.cc | 6 | ||||
| -rw-r--r-- | test/testutil/tap_bio.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/test/ossl_shim/async_bio.cc b/test/ossl_shim/async_bio.cc index f0f6a38dbf..cbbabe01ea 100644 --- a/test/ossl_shim/async_bio.cc +++ b/test/ossl_shim/async_bio.cc @@ -118,10 +118,10 @@ static int AsyncFree(BIO *bio) { return 1; } -static long AsyncCallbackCtrl(BIO *bio, int cmd, bio_info_cb fp) { - if (BIO_next(bio) == NULL) { +static long AsyncCallbackCtrl(BIO *bio, int cmd, BIO_info_cb fp) +{ + if (BIO_next(bio) == NULL) return 0; - } return BIO_callback_ctrl(BIO_next(bio), cmd, fp); } diff --git a/test/ossl_shim/packeted_bio.cc b/test/ossl_shim/packeted_bio.cc index e1b3c6c678..450baeccdf 100644 --- a/test/ossl_shim/packeted_bio.cc +++ b/test/ossl_shim/packeted_bio.cc @@ -240,10 +240,10 @@ static int PacketedFree(BIO *bio) { return 1; } -static long PacketedCallbackCtrl(BIO *bio, int cmd, bio_info_cb fp) { - if (BIO_next(bio) == NULL) { +static long PacketedCallbackCtrl(BIO *bio, int cmd, BIO_info_cb fp) +{ + if (BIO_next(bio) == NULL) return 0; - } return BIO_callback_ctrl(BIO_next(bio), cmd, fp); } diff --git a/test/testutil/tap_bio.c b/test/testutil/tap_bio.c index f78dfb81d9..a6c903b5ae 100644 --- a/test/testutil/tap_bio.c +++ b/test/testutil/tap_bio.c @@ -18,7 +18,7 @@ static int tap_gets(BIO *b, char *str, int size); static long tap_ctrl(BIO *b, int cmd, long arg1, void *arg2); static int tap_new(BIO *b); static int tap_free(BIO *b); -static long tap_callback_ctrl(BIO *h, int cmd, bio_info_cb *fp); +static long tap_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp); const BIO_METHOD *BIO_f_tap(void) { @@ -134,7 +134,7 @@ static long tap_ctrl(BIO *b, int cmd, long num, void *ptr) return BIO_ctrl(next, cmd, num, ptr); } -static long tap_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp) +static long tap_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp) { return BIO_callback_ctrl(BIO_next(b), cmd, fp); } |