Make the naming scheme for dispatched functions more consistent

[oweals/openssl.git] / providers / common / bio_prov.c

diff --git a/providers/common/bio_prov.c b/providers/common/bio_prov.c
index 2186894b11072092ce388a6dea1ad13ae6afcf83..c193658c58480edf06c3990e460abe74e917b413 100644 (file)
--- a/providers/common/bio_prov.c
+++ b/providers/common/bio_prov.c
@@ -12,12 +12,12 @@
 #include "internal/cryptlib.h"
 #include "prov/bio.h"
 
-static OSSL_BIO_new_file_fn *c_bio_new_file = NULL;
-static OSSL_BIO_new_membuf_fn *c_bio_new_membuf = NULL;
-static OSSL_BIO_read_ex_fn *c_bio_read_ex = NULL;
-static OSSL_BIO_write_ex_fn *c_bio_write_ex = NULL;
-static OSSL_BIO_free_fn *c_bio_free = NULL;
-static OSSL_BIO_vprintf_fn *c_bio_vprintf = NULL;
+static OSSL_FUNC_BIO_new_file_fn *c_bio_new_file = NULL;
+static OSSL_FUNC_BIO_new_membuf_fn *c_bio_new_membuf = NULL;
+static OSSL_FUNC_BIO_read_ex_fn *c_bio_read_ex = NULL;
+static OSSL_FUNC_BIO_write_ex_fn *c_bio_write_ex = NULL;
+static OSSL_FUNC_BIO_free_fn *c_bio_free = NULL;
+static OSSL_FUNC_BIO_vprintf_fn *c_bio_vprintf = NULL;
 
 int ossl_prov_bio_from_dispatch(const OSSL_DISPATCH *fns)
 {
@@ -25,27 +25,27 @@ int ossl_prov_bio_from_dispatch(const OSSL_DISPATCH *fns)
         switch (fns->function_id) {
         case OSSL_FUNC_BIO_NEW_FILE:
             if (c_bio_new_file == NULL)
-                c_bio_new_file = OSSL_get_BIO_new_file(fns);
+                c_bio_new_file = OSSL_FUNC_BIO_new_file(fns);
             break;
         case OSSL_FUNC_BIO_NEW_MEMBUF:
             if (c_bio_new_membuf == NULL)
-                c_bio_new_membuf = OSSL_get_BIO_new_membuf(fns);
+                c_bio_new_membuf = OSSL_FUNC_BIO_new_membuf(fns);
             break;
         case OSSL_FUNC_BIO_READ_EX:
             if (c_bio_read_ex == NULL)
-                c_bio_read_ex = OSSL_get_BIO_read_ex(fns);
+                c_bio_read_ex = OSSL_FUNC_BIO_read_ex(fns);
             break;
         case OSSL_FUNC_BIO_WRITE_EX:
             if (c_bio_write_ex == NULL)
-                c_bio_write_ex = OSSL_get_BIO_write_ex(fns);
+                c_bio_write_ex = OSSL_FUNC_BIO_write_ex(fns);
             break;
         case OSSL_FUNC_BIO_FREE:
             if (c_bio_free == NULL)
-                c_bio_free = OSSL_get_BIO_free(fns);
+                c_bio_free = OSSL_FUNC_BIO_free(fns);
             break;
         case OSSL_FUNC_BIO_VPRINTF:
             if (c_bio_vprintf == NULL)
-                c_bio_vprintf = OSSL_get_BIO_vprintf(fns);
+                c_bio_vprintf = OSSL_FUNC_BIO_vprintf(fns);
             break;
         }
     }