libmongocrypt-helper 1.7.4.0.1002 → 1.8.0.0.1001

data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-log-private.h

@@ -17,85 +17,53 @@
 #ifndef MONGOCRYPT_LOG_PRIVATE_H
 #define MONGOCRYPT_LOG_PRIVATE_H
 
-#include "mongocrypt.h"
 #include "mongocrypt-mutex-private.h"
+#include "mongocrypt.h"
 
 typedef struct {
-   mongocrypt_mutex_t mutex; /* protects fn and ctx. */
-   mongocrypt_log_fn_t fn;
-   void *ctx;
-   bool trace_enabled;
+    mongocrypt_mutex_t mutex; /* protects fn and ctx. */
+    mongocrypt_log_fn_t fn;
+    void *ctx;
+    bool trace_enabled;
 } _mongocrypt_log_t;
 
-void
-_mongocrypt_stdout_log_fn (mongocrypt_log_level_t level,
-                           const char *message,
-                           uint32_t message_len,
-                           void *ctx);
+void _mongocrypt_stdout_log_fn(mongocrypt_log_level_t level, const char *message, uint32_t message_len, void *ctx);
 
-void
-_mongocrypt_log (_mongocrypt_log_t *log,
-                 mongocrypt_log_level_t level,
-                 const char *message,
-                 ...) BSON_GNUC_PRINTF (3, 4);
+void _mongocrypt_log(_mongocrypt_log_t *log, mongocrypt_log_level_t level, const char *message, ...)
+    BSON_GNUC_PRINTF(3, 4);
 
-void
-_mongocrypt_log_init (_mongocrypt_log_t *log);
+void _mongocrypt_log_init(_mongocrypt_log_t *log);
 
-void
-_mongocrypt_log_cleanup (_mongocrypt_log_t *log);
-
-void
-_mongocrypt_log_set_fn (_mongocrypt_log_t *log,
-                        mongocrypt_log_fn_t fn,
-                        void *ctx);
+void _mongocrypt_log_cleanup(_mongocrypt_log_t *log);
 
+void _mongocrypt_log_set_fn(_mongocrypt_log_t *log, mongocrypt_log_fn_t fn, void *ctx);
 
 #ifdef MONGOCRYPT_ENABLE_TRACE
 
-#define CRYPT_TRACEF(log, fmt, ...)             \
-   _mongocrypt_log (log,                        \
-                    MONGOCRYPT_LOG_LEVEL_TRACE, \
-                    "(%s:%d) " fmt,             \
-                    BSON_FUNC,                  \
-                    __LINE__,                   \
-                    __VA_ARGS__)
-
-#define CRYPT_TRACE(log, msg) CRYPT_TRACEF (crypt, "%s", msg)
-
-#define CRYPT_ENTRY(log) \
-   _mongocrypt_log (     \
-      crypt, MONGOCRYPT_LOG_LEVEL_TRACE, "entry (%s:%d)", BSON_FUNC, __LINE__)
-
-#define CRYPT_EXIT(log)                            \
-   do {                                            \
-      _mongocrypt_log (crypt,                      \
-                       MONGOCRYPT_LOG_LEVEL_TRACE, \
-                       "exit (%s:%d)",             \
-                       BSON_FUNC,                  \
-                       __LINE__);                  \
-      return;                                      \
-   } while (0)
-
-#define CRYPT_RETURN(log, x)                       \
-   do {                                            \
-      _mongocrypt_log (log,                        \
-                       MONGOCRYPT_LOG_LEVEL_TRACE, \
-                       "return (%s:%d)",           \
-                       BSON_FUNC,                  \
-                       __LINE__);                  \
-      return (x);                                  \
-   } while (0)
-
-#define CRYPT_GOTO(log, x)                         \
-   do {                                            \
-      _mongocrypt_log (log,                        \
-                       MONGOCRYPT_LOG_LEVEL_TRACE, \
-                       "goto (%s:%d)",             \
-                       BSON_FUNC,                  \
-                       __LINE__);                  \
-      goto x;                                      \
-   } while (0)
+#define CRYPT_TRACEF(log, fmt, ...)                                                                                    \
+    _mongocrypt_log(log, MONGOCRYPT_LOG_LEVEL_TRACE, "(%s:%d) " fmt, BSON_FUNC, __LINE__, __VA_ARGS__)
+
+#define CRYPT_TRACE(log, msg) CRYPT_TRACEF(crypt, "%s", msg)
+
+#define CRYPT_ENTRY(log) _mongocrypt_log(crypt, MONGOCRYPT_LOG_LEVEL_TRACE, "entry (%s:%d)", BSON_FUNC, __LINE__)
+
+#define CRYPT_EXIT(log)                                                                                                \
+    do {                                                                                                               \
+        _mongocrypt_log(crypt, MONGOCRYPT_LOG_LEVEL_TRACE, "exit (%s:%d)", BSON_FUNC, __LINE__);                       \
+        return;                                                                                                        \
+    } while (0)
+
+#define CRYPT_RETURN(log, x)                                                                                           \
+    do {                                                                                                               \
+        _mongocrypt_log(log, MONGOCRYPT_LOG_LEVEL_TRACE, "return (%s:%d)", BSON_FUNC, __LINE__);                       \
+        return (x);                                                                                                    \
+    } while (0)
+
+#define CRYPT_GOTO(log, x)                                                                                             \
+    do {                                                                                                               \
+        _mongocrypt_log(log, MONGOCRYPT_LOG_LEVEL_TRACE, "goto (%s:%d)", BSON_FUNC, __LINE__);                         \
+        goto x;                                                                                                        \
+    } while (0)
 
 #else
 

data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-log.c

@@ -20,104 +20,70 @@
 
 #include <bson/bson.h>
 
-void
-_mongocrypt_log_init (_mongocrypt_log_t *log)
-{
-   BSON_ASSERT_PARAM (log);
-
-   _mongocrypt_mutex_init (&log->mutex);
-   /* Initially, no log function is set. */
-   _mongocrypt_log_set_fn (log, NULL, NULL);
+void _mongocrypt_log_init(_mongocrypt_log_t *log) {
+    BSON_ASSERT_PARAM(log);
+
+    _mongocrypt_mutex_init(&log->mutex);
+    /* Initially, no log function is set. */
+    _mongocrypt_log_set_fn(log, NULL, NULL);
 #ifdef MONGOCRYPT_ENABLE_TRACE
-   log->trace_enabled = (getenv ("MONGOCRYPT_TRACE") != NULL);
+    log->trace_enabled = (getenv("MONGOCRYPT_TRACE") != NULL);
 #endif
 }
 
+void _mongocrypt_log_cleanup(_mongocrypt_log_t *log) {
+    if (!log) {
+        return;
+    }
 
-void
-_mongocrypt_log_cleanup (_mongocrypt_log_t *log)
-{
-   if (!log) {
-      return;
-   }
-
-   _mongocrypt_mutex_cleanup (&log->mutex);
-   memset (log, 0, sizeof (*log));
+    _mongocrypt_mutex_cleanup(&log->mutex);
+    memset(log, 0, sizeof(*log));
 }
 
-void
-_mongocrypt_stdout_log_fn (mongocrypt_log_level_t level,
-                           const char *message,
-                           uint32_t message_len,
-                           void *ctx)
-{
-   BSON_ASSERT_PARAM (message);
-
-   switch (level) {
-   case MONGOCRYPT_LOG_LEVEL_FATAL:
-      printf ("FATAL");
-      break;
-   case MONGOCRYPT_LOG_LEVEL_ERROR:
-      printf ("ERROR");
-      break;
-   case MONGOCRYPT_LOG_LEVEL_WARNING:
-      printf ("WARNING");
-      break;
-   case MONGOCRYPT_LOG_LEVEL_INFO:
-      printf ("INFO");
-      break;
-   case MONGOCRYPT_LOG_LEVEL_TRACE:
-      printf ("TRACE");
-      break;
-   default:
-      printf ("UNKNOWN");
-      break;
-   }
-   printf (" %s\n", message);
+void _mongocrypt_stdout_log_fn(mongocrypt_log_level_t level, const char *message, uint32_t message_len, void *ctx) {
+    BSON_ASSERT_PARAM(message);
+
+    switch (level) {
+    case MONGOCRYPT_LOG_LEVEL_FATAL: printf("FATAL"); break;
+    case MONGOCRYPT_LOG_LEVEL_ERROR: printf("ERROR"); break;
+    case MONGOCRYPT_LOG_LEVEL_WARNING: printf("WARNING"); break;
+    case MONGOCRYPT_LOG_LEVEL_INFO: printf("INFO"); break;
+    case MONGOCRYPT_LOG_LEVEL_TRACE: printf("TRACE"); break;
+    default: printf("UNKNOWN"); break;
+    }
+    printf(" %s\n", message);
 }
 
+void _mongocrypt_log_set_fn(_mongocrypt_log_t *log, mongocrypt_log_fn_t fn, void *ctx) {
+    BSON_ASSERT_PARAM(log);
 
-void
-_mongocrypt_log_set_fn (_mongocrypt_log_t *log,
-                        mongocrypt_log_fn_t fn,
-                        void *ctx)
-{
-   BSON_ASSERT_PARAM (log);
-
-   _mongocrypt_mutex_lock (&log->mutex);
-   log->fn = fn;
-   log->ctx = ctx;
-   _mongocrypt_mutex_unlock (&log->mutex);
+    _mongocrypt_mutex_lock(&log->mutex);
+    log->fn = fn;
+    log->ctx = ctx;
+    _mongocrypt_mutex_unlock(&log->mutex);
 }
 
+void _mongocrypt_log(_mongocrypt_log_t *log, mongocrypt_log_level_t level, const char *format, ...) {
+    va_list args;
+    char *message;
 
-void
-_mongocrypt_log (_mongocrypt_log_t *log,
-                 mongocrypt_log_level_t level,
-                 const char *format,
-                 ...)
-{
-   va_list args;
-   char *message;
-
-   BSON_ASSERT_PARAM (log);
-   BSON_ASSERT_PARAM (format);
-
-   if (level == MONGOCRYPT_LOG_LEVEL_TRACE && !log->trace_enabled) {
-      return;
-   }
+    BSON_ASSERT_PARAM(log);
+    BSON_ASSERT_PARAM(format);
 
+    if (level == MONGOCRYPT_LOG_LEVEL_TRACE && !log->trace_enabled) {
+        return;
+    }
 
-   va_start (args, format);
-   message = bson_strdupv_printf (format, args);
-   va_end (args);
+    va_start(args, format);
+    message = bson_strdupv_printf(format, args);
+    va_end(args);
 
-   BSON_ASSERT (message);
+    BSON_ASSERT(message);
 
-   _mongocrypt_mutex_lock (&log->mutex);
-   if (log->fn) {
-      log->fn (level, message, (uint32_t) strlen (message), log->ctx);
-   }
-   _mongocrypt_mutex_unlock (&log->mutex);
-   bson_free (message);
+    _mongocrypt_mutex_lock(&log->mutex);
+    if (log->fn) {
+        log->fn(level, message, (uint32_t)strlen(message), log->ctx);
+    }
+    _mongocrypt_mutex_unlock(&log->mutex);
+    bson_free(message);
 }

data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-marking-private.h

@@ -19,56 +19,50 @@
 
 #include "mc-fle2-encryption-placeholder-private.h"
 #include "mc-range-mincover-private.h"
-#include "mongocrypt-private.h"
 #include "mongocrypt-ciphertext-private.h"
+#include "mongocrypt-private.h"
 
 typedef enum {
-   MONGOCRYPT_MARKING_FLE1_BY_ID,
-   MONGOCRYPT_MARKING_FLE1_BY_ALTNAME,
-   MONGOCRYPT_MARKING_FLE2_ENCRYPTION,
+    MONGOCRYPT_MARKING_FLE1_BY_ID,
+    MONGOCRYPT_MARKING_FLE1_BY_ALTNAME,
+    MONGOCRYPT_MARKING_FLE2_ENCRYPTION,
 } mongocrypt_marking_type_t;
 
 typedef struct {
-   mongocrypt_marking_type_t type;
+    mongocrypt_marking_type_t type;
 
-   union {
-      struct {
-         // Markings used by FLE1
-         mongocrypt_encryption_algorithm_t algorithm;
-         bson_iter_t v_iter;
+    union {
+        struct {
+            // Markings used by FLE1
+            mongocrypt_encryption_algorithm_t algorithm;
+            bson_iter_t v_iter;
 
-         _mongocrypt_buffer_t key_id;
-         bson_value_t key_alt_name;
-      };
+            _mongocrypt_buffer_t key_id;
+            bson_value_t key_alt_name;
+        };
 
-      mc_FLE2EncryptionPlaceholder_t fle2;
-   };
+        mc_FLE2EncryptionPlaceholder_t fle2;
+    };
 } _mongocrypt_marking_t;
 
+void _mongocrypt_marking_init(_mongocrypt_marking_t *marking);
 
-void
-_mongocrypt_marking_init (_mongocrypt_marking_t *marking);
-
-void
-_mongocrypt_marking_cleanup (_mongocrypt_marking_t *marking);
+void _mongocrypt_marking_cleanup(_mongocrypt_marking_t *marking);
 
-bool
-_mongocrypt_marking_parse_unowned (const _mongocrypt_buffer_t *in,
-                                   _mongocrypt_marking_t *out,
-                                   mongocrypt_status_t *status)
-   MONGOCRYPT_WARN_UNUSED_RESULT;
+bool _mongocrypt_marking_parse_unowned(const _mongocrypt_buffer_t *in,
+                                       _mongocrypt_marking_t *out,
+                                       mongocrypt_status_t *status) MONGOCRYPT_WARN_UNUSED_RESULT;
 
-bool
-_mongocrypt_marking_to_ciphertext (void *ctx,
-                                   _mongocrypt_marking_t *marking,
-                                   _mongocrypt_ciphertext_t *ciphertext,
-                                   mongocrypt_status_t *status)
-   MONGOCRYPT_WARN_UNUSED_RESULT;
+// Callers are expected to initialize `ciphertext` with
+// `_mongocrypt_ciphertext_init before calling,
+// and eventually free it using `_mongocrypt_ciphertext_cleanup`.
+bool _mongocrypt_marking_to_ciphertext(void *ctx,
+                                       _mongocrypt_marking_t *marking,
+                                       _mongocrypt_ciphertext_t *ciphertext,
+                                       mongocrypt_status_t *status) MONGOCRYPT_WARN_UNUSED_RESULT;
 
-mc_mincover_t *
-mc_get_mincover_from_FLE2RangeFindSpec (mc_FLE2RangeFindSpec_t *findSpec,
-                                        size_t sparsity,
-                                        mongocrypt_status_t *status)
-   MONGOCRYPT_WARN_UNUSED_RESULT;
+mc_mincover_t *mc_get_mincover_from_FLE2RangeFindSpec(mc_FLE2RangeFindSpec_t *findSpec,
+                                                      size_t sparsity,
+                                                      mongocrypt_status_t *status) MONGOCRYPT_WARN_UNUSED_RESULT;
 
 #endif /* MONGOCRYPT_MARKING_PRIVATE_H */