use typedef

Author: baileympearson

addon/mongocrypt.cc

@@ -567,16 +567,17 @@ Value MongoCrypt::MakeExplicitEncryptionContext(const CallbackInfo& info) {
     }
 
     bool expression_mode = options.Get("expressionMode").ToBoolean();
-    auto context_init_function = expression_mode ? mongocrypt_ctx_explicit_encrypt_expression_init
-                                                 : mongocrypt_ctx_explicit_encrypt_init;
+    ExplicitEncryptionContextInitFunction context_init_function =
+        expression_mode ? mongocrypt_ctx_explicit_encrypt_expression_init
+                        : mongocrypt_ctx_explicit_encrypt_init;
 
     return MakeExplicitEncryptionContextInternal(context_init_function, valueBuffer, options);
 }
 
-Value MongoCrypt::MakeExplicitEncryptionContextInternal(bool (*init_fn)(mongocrypt_ctx_t*,
-                                                                        mongocrypt_binary_t*),
-                                                        const Uint8Array& valueBuffer,
-                                                        const Object& options) {
+Value MongoCrypt::MakeExplicitEncryptionContextInternal(
+    ExplicitEncryptionContextInitFunction context_init_function,
+    const Uint8Array& valueBuffer,
+    const Object& options) {
     std::unique_ptr<mongocrypt_ctx_t, MongoCryptContextDeleter> context(
         mongocrypt_ctx_new(_mongo_crypt.get()));
 
@@ -642,7 +643,7 @@ Value MongoCrypt::MakeExplicitEncryptionContextInternal(bool (*init_fn)(mongocry
     std::unique_ptr<mongocrypt_binary_t, MongoCryptBinaryDeleter> binaryValue(
         Uint8ArrayToBinary(valueBuffer));
 
-    const bool status = init_fn(context.get(), binaryValue.get());
+    const bool status = context_init_function(context.get(), binaryValue.get());
 
     if (!status) {
         throw TypeError::New(Env(), errorStringFromStatus(context.get()));

addon/mongocrypt.h

@@ -37,6 +37,8 @@ struct MongoCryptContextDeleter {
     }
 };
 
+typedef bool (*ExplicitEncryptionContextInitFunction)(mongocrypt_ctx_t*, mongocrypt_binary_t*);
+
 class MongoCrypt : public Napi::ObjectWrap<MongoCrypt> {
    public:
     static Napi::Function Init(Napi::Env env);
@@ -48,8 +50,7 @@ class MongoCrypt : public Napi::ObjectWrap<MongoCrypt> {
     Napi::Value MakeExplicitDecryptionContext(const Napi::CallbackInfo& info);
     Napi::Value MakeDataKeyContext(const Napi::CallbackInfo& info);
     Napi::Value MakeRewrapManyDataKeyContext(const Napi::CallbackInfo& info);
-    Napi::Value MakeExplicitEncryptionContextInternal(bool (*init_fn)(mongocrypt_ctx_t*,
-                                                                      mongocrypt_binary_t*),
+    Napi::Value MakeExplicitEncryptionContextInternal(ExplicitEncryptionContextInitFunction init_fn,
                                                       const Napi::Uint8Array& value,
                                                       const Napi::Object& options);