libmongocrypt-helper 1.7.4.0.1002 → 1.11.0.0.1001

data/ext/libmongocrypt/libmongocrypt/src/mlib/str.test.c

@@ -1,137 +1,122 @@
 #include "./str.h"
 
-#define CHECK(Expr)                                   \
-   ((Expr) ? 0                                        \
-           : ((fprintf (stderr,                       \
-                        "%s:%d: Check '%s' failed\n", \
-                        __FILE__,                     \
-                        __LINE__,                     \
-                        #Expr),                       \
-               abort ()),                             \
-              0))
-
-#define test_predicate(Bool, Left, Pred, Right) \
-   MSTR_ASSERT (Bool, mstrv_lit (Left), Pred, mstrv_lit (Right))
-
-int
-main ()
-{
-   // Test the null-initializers:
-   mstr str = MSTR_NULL;
-   mstr_view null_view = MSTRV_NULL;
-   (void) null_view;
-
-   str = mstr_copy_cstr ("foo");
-   CHECK (str.len == 3);
-   MSTR_ASSERT_EQ (str.view, mstrv_lit ("foo"));
-   CHECK (strncmp (str.data, "foo", 3) == 0);
-
-   mstr_inplace_append (&str, mstrv_lit ("bar"));
-   MSTR_ASSERT_EQ (str.view, mstrv_lit ("foobar"));
-
-   mstr_free (str);
-
-   str = mstr_copy_cstr ("foobar");
-   mstr_inplace_trunc (&str, 3);
-   MSTR_ASSERT_EQ (str.view, mstrv_lit ("foo"));
-   mstr_free (str);
-
-   int pos = mstr_find (mstrv_lit ("foo"), mstrv_lit ("bar"));
-   CHECK (pos == -1);
-
-   pos = mstr_find (mstrv_lit ("foo"), mstrv_lit ("barbaz"));
-   CHECK (pos == -1);
-
-   pos = mstr_find (mstrv_lit ("foobar"), mstrv_lit ("bar"));
-   CHECK (pos == 3);
-
-   // Simple replacement:
-   str = mstr_copy_cstr ("foo bar baz");
-   mstr str2 = mstr_replace (str.view, mstrv_lit ("bar"), mstrv_lit ("foo"));
-   MSTR_ASSERT_EQ (str2.view, mstrv_lit ("foo foo baz"));
-   mstr_free (str);
-
-   // Replace multiple instances:
-   mstr_inplace_replace (&str2, mstrv_lit ("foo"), mstrv_lit ("baz"));
-   MSTR_ASSERT_EQ (str2.view, mstrv_lit ("baz baz baz"));
-
-   // Replace with a string containing the needle:
-   mstr_inplace_replace (&str2, mstrv_lit ("baz"), mstrv_lit ("foo bar baz"));
-   MSTR_ASSERT_EQ (str2.view,
-                   mstrv_lit ("foo bar baz foo bar baz foo bar baz"));
-
-   // Replace with empty string:
-   mstr_inplace_replace (&str2, mstrv_lit ("bar "), mstrv_lit (""));
-   MSTR_ASSERT_EQ (str2.view, mstrv_lit ("foo baz foo baz foo baz"));
-
-   // Replacing a string that isn't there:
-   mstr_inplace_replace (&str2, mstrv_lit ("quux"), mstrv_lit ("nope"));
-   MSTR_ASSERT_EQ (str2.view, mstrv_lit ("foo baz foo baz foo baz"));
-
-   // Replacing an empty string is just a duplication:
-   mstr_inplace_replace (&str2, mstrv_lit (""), mstrv_lit ("never"));
-   MSTR_ASSERT_EQ (str2.view, mstrv_lit ("foo baz foo baz foo baz"));
-
-   mstr_free (str2);
-
-   CHECK (mstrv_view_cstr ("foo\000bar").len == 3);
-   CHECK (mstrv_lit ("foo\000bar").len == 7);
-
-   str = mstr_new (0).mstr;
-   MSTR_ITER_SPLIT (part, mstrv_lit ("foo bar baz"), mstrv_lit (" "))
-   {
-      mstr_inplace_append (&str, part);
-      if (mstr_eq (part, mstrv_lit ("bar"))) {
-         break;
-      }
-   }
-   MSTR_ASSERT_EQ (str.view, mstrv_lit ("foobar"));
-   mstr_free (str);
-
-   // rfind at the beginning of the string
-   CHECK (mstr_rfind (mstrv_lit ("foobar"), mstrv_lit ("foo")) == 0);
-
-   str = mstr_splice (mstrv_lit ("foobar"), 1, 2, MSTRV_NULL);
-   MSTR_ASSERT_EQ (str.view, mstrv_lit ("fbar"));
-   mstr_free (str);
-
-   test_predicate (true, "foo", contains, "o");
-   test_predicate (true, "foo", contains, "oo");
-   test_predicate (true, "foo", contains, "foo");
-   test_predicate (true, "foo", contains, "fo");
-   test_predicate (true, "foo", contains, "f");
-   test_predicate (true, "foo", contains, "");
-   test_predicate (false, "foo", contains, "fooo");
-   test_predicate (false, "foo", contains, "ofo");
-   test_predicate (false, "foo", contains, "of");
-   test_predicate (false, "foo", contains, "bar");
-
-   test_predicate (true, "foo", starts_with, "f");
-   test_predicate (true, "foo", starts_with, "fo");
-   test_predicate (true, "foo", starts_with, "foo");
-   test_predicate (true, "foo", starts_with, "");
-   test_predicate (false, "foo", starts_with, "o");
-   test_predicate (false, "foo", starts_with, "oo");
-   test_predicate (false, "foo", starts_with, "oof");
-   test_predicate (false, "foo", starts_with, "bar");
-
-   test_predicate (true, "foo", ends_with, "o");
-   test_predicate (true, "foo", ends_with, "oo");
-   test_predicate (true, "foo", ends_with, "foo");
-   test_predicate (true, "foo", ends_with, "");
-   test_predicate (false, "foo", ends_with, "f");
-   test_predicate (false, "foo", ends_with, "fo");
-   test_predicate (false, "foo", ends_with, "oof");
-   test_predicate (false, "foo", ends_with, "bar");
+#define CHECK(Expr)                                                                                                    \
+    ((Expr) ? 0 : ((fprintf(stderr, "%s:%d: Check '%s' failed\n", __FILE__, __LINE__, #Expr), abort()), 0))
+
+#define test_predicate(Bool, Left, Pred, Right) MSTR_ASSERT(Bool, mstrv_lit(Left), Pred, mstrv_lit(Right))
+
+int main() {
+    // Test the null-initializers:
+    mstr str = MSTR_NULL;
+    mstr_view null_view = MSTRV_NULL;
+    (void)null_view;
+
+    str = mstr_copy_cstr("foo");
+    CHECK(str.len == 3);
+    MSTR_ASSERT_EQ(str.view, mstrv_lit("foo"));
+    CHECK(strncmp(str.data, "foo", 3) == 0);
+
+    mstr_inplace_append(&str, mstrv_lit("bar"));
+    MSTR_ASSERT_EQ(str.view, mstrv_lit("foobar"));
+
+    mstr_free(str);
+
+    str = mstr_copy_cstr("foobar");
+    mstr_inplace_trunc(&str, 3);
+    MSTR_ASSERT_EQ(str.view, mstrv_lit("foo"));
+    mstr_free(str);
+
+    int pos = mstr_find(mstrv_lit("foo"), mstrv_lit("bar"));
+    CHECK(pos == -1);
+
+    pos = mstr_find(mstrv_lit("foo"), mstrv_lit("barbaz"));
+    CHECK(pos == -1);
+
+    pos = mstr_find(mstrv_lit("foobar"), mstrv_lit("bar"));
+    CHECK(pos == 3);
+
+    // Simple replacement:
+    str = mstr_copy_cstr("foo bar baz");
+    mstr str2 = mstr_replace(str.view, mstrv_lit("bar"), mstrv_lit("foo"));
+    MSTR_ASSERT_EQ(str2.view, mstrv_lit("foo foo baz"));
+    mstr_free(str);
+
+    // Replace multiple instances:
+    mstr_inplace_replace(&str2, mstrv_lit("foo"), mstrv_lit("baz"));
+    MSTR_ASSERT_EQ(str2.view, mstrv_lit("baz baz baz"));
+
+    // Replace with a string containing the needle:
+    mstr_inplace_replace(&str2, mstrv_lit("baz"), mstrv_lit("foo bar baz"));
+    MSTR_ASSERT_EQ(str2.view, mstrv_lit("foo bar baz foo bar baz foo bar baz"));
+
+    // Replace with empty string:
+    mstr_inplace_replace(&str2, mstrv_lit("bar "), mstrv_lit(""));
+    MSTR_ASSERT_EQ(str2.view, mstrv_lit("foo baz foo baz foo baz"));
+
+    // Replacing a string that isn't there:
+    mstr_inplace_replace(&str2, mstrv_lit("quux"), mstrv_lit("nope"));
+    MSTR_ASSERT_EQ(str2.view, mstrv_lit("foo baz foo baz foo baz"));
+
+    // Replacing an empty string is just a duplication:
+    mstr_inplace_replace(&str2, mstrv_lit(""), mstrv_lit("never"));
+    MSTR_ASSERT_EQ(str2.view, mstrv_lit("foo baz foo baz foo baz"));
+
+    mstr_free(str2);
+
+    CHECK(mstrv_view_cstr("foo\000bar").len == 3);
+    CHECK(mstrv_lit("foo\000bar").len == 7);
+
+    str = mstr_new(0).mstr;
+    MSTR_ITER_SPLIT(part, mstrv_lit("foo bar baz"), mstrv_lit(" ")) {
+        mstr_inplace_append(&str, part);
+        if (mstr_eq(part, mstrv_lit("bar"))) {
+            break;
+        }
+    }
+    MSTR_ASSERT_EQ(str.view, mstrv_lit("foobar"));
+    mstr_free(str);
+
+    // rfind at the beginning of the string
+    CHECK(mstr_rfind(mstrv_lit("foobar"), mstrv_lit("foo")) == 0);
+
+    str = mstr_splice(mstrv_lit("foobar"), 1, 2, MSTRV_NULL);
+    MSTR_ASSERT_EQ(str.view, mstrv_lit("fbar"));
+    mstr_free(str);
+
+    test_predicate(true, "foo", contains, "o");
+    test_predicate(true, "foo", contains, "oo");
+    test_predicate(true, "foo", contains, "foo");
+    test_predicate(true, "foo", contains, "fo");
+    test_predicate(true, "foo", contains, "f");
+    test_predicate(true, "foo", contains, "");
+    test_predicate(false, "foo", contains, "fooo");
+    test_predicate(false, "foo", contains, "ofo");
+    test_predicate(false, "foo", contains, "of");
+    test_predicate(false, "foo", contains, "bar");
+
+    test_predicate(true, "foo", starts_with, "f");
+    test_predicate(true, "foo", starts_with, "fo");
+    test_predicate(true, "foo", starts_with, "foo");
+    test_predicate(true, "foo", starts_with, "");
+    test_predicate(false, "foo", starts_with, "o");
+    test_predicate(false, "foo", starts_with, "oo");
+    test_predicate(false, "foo", starts_with, "oof");
+    test_predicate(false, "foo", starts_with, "bar");
+
+    test_predicate(true, "foo", ends_with, "o");
+    test_predicate(true, "foo", ends_with, "oo");
+    test_predicate(true, "foo", ends_with, "foo");
+    test_predicate(true, "foo", ends_with, "");
+    test_predicate(false, "foo", ends_with, "f");
+    test_predicate(false, "foo", ends_with, "fo");
+    test_predicate(false, "foo", ends_with, "oof");
+    test_predicate(false, "foo", ends_with, "bar");
 
 #ifdef _WIN32
-   const wchar_t *wide = L"🕴️";
-   mstr_narrow_result narrow = mstr_win32_narrow (wide);
-   CHECK (narrow.error == 0);
-   MSTR_ASSERT_EQ (
-      narrow.string.view,
-      mstrv_lit (
-         "\xc3\xb0\xc5\xb8\xe2\x80\xa2\xc2\xb4\xc3\xaf\xc2\xb8\xc2\x8f"));
-   mstr_free (narrow.string);
+    const wchar_t *wide = L"🕴️";
+    mstr_narrow_result narrow = mstr_win32_narrow(wide);
+    CHECK(narrow.error == 0);
+    MSTR_ASSERT_EQ(narrow.string.view, mstrv_lit("\xc3\xb0\xc5\xb8\xe2\x80\xa2\xc2\xb4\xc3\xaf\xc2\xb8\xc2\x8f"));
+    mstr_free(narrow.string);
 #endif
 }

data/ext/libmongocrypt/libmongocrypt/src/mlib/thread.h

@@ -16,9 +16,9 @@
  */
 typedef struct mlib_once_flag {
 #ifdef _WIN32
-   INIT_ONCE _native;
+    INIT_ONCE _native;
 #else
-   pthread_once_t _native;
+    pthread_once_t _native;
 #endif
 } mlib_once_flag;
 
@@ -28,34 +28,28 @@ typedef struct mlib_once_flag {
  * "reset" a flag.
  */
 #ifdef _WIN32
-#define MLIB_ONCE_INITIALIZER          \
-   {                                   \
-      ._native = INIT_ONCE_STATIC_INIT \
-   }
+#define MLIB_ONCE_INITIALIZER                                                                                          \
+    { ._native = INIT_ONCE_STATIC_INIT }
 #else
-#define MLIB_ONCE_INITIALIZER      \
-   {                               \
-      ._native = PTHREAD_ONCE_INIT \
-   }
+#define MLIB_ONCE_INITIALIZER                                                                                          \
+    { ._native = PTHREAD_ONCE_INIT }
 #endif
 
 /**
  * @brief The type of an mlib_call_once callback function.
  */
-typedef void (*mlib_init_once_fn_t) (void);
+typedef void (*mlib_init_once_fn_t)(void);
 
 #if _WIN32
 /**
  * An indirection layer for mlib_once on Windows platforms. Do not use directly.
  */
-static inline BOOL WINAPI
-_mlib_win32_once_callthru (PINIT_ONCE once, PVOID param, PVOID *ctx)
-{
-   (void) once;
-   (void) ctx;
-   mlib_init_once_fn_t *fn = param;
-   (*fn) ();
-   return TRUE;
+static inline BOOL WINAPI _mlib_win32_once_callthru(PINIT_ONCE once, PVOID param, PVOID *ctx) {
+    (void)once;
+    (void)ctx;
+    mlib_init_once_fn_t *fn = param;
+    (*fn)();
+    return TRUE;
 }
 #endif
 
@@ -73,15 +67,12 @@ _mlib_win32_once_callthru (PINIT_ONCE once, PVOID param, PVOID *ctx)
  * @param fn A callback to execute if the flag is not in the "finished" state
  * @return true on success, false otherwise
  */
-static inline bool
-mlib_call_once (mlib_once_flag *flag, mlib_init_once_fn_t fn)
-{
+static inline bool mlib_call_once(mlib_once_flag *flag, mlib_init_once_fn_t fn) {
 #ifdef _WIN32
-   bool okay = InitOnceExecuteOnce (
-      &flag->_native, &_mlib_win32_once_callthru, &fn, NULL);
-   return okay;
+    bool okay = InitOnceExecuteOnce(&flag->_native, &_mlib_win32_once_callthru, &fn, NULL);
+    return okay;
 #else
-   return pthread_once (&flag->_native, fn) == 0;
+    return pthread_once(&flag->_native, fn) == 0;
 #endif
 }
 

data/ext/libmongocrypt/libmongocrypt/src/mlib/user-check.h

@@ -1,4 +1,4 @@
 #ifndef MLIB_USER
-#error \
-   "The file being compiled transitively #include'd a mongo-mlib header, but is not a direct consumer of mlib, which is a private library for MongoDB C driver libraries"
+#error                                                                                                                 \
+    "The file being compiled transitively #include'd a mongo-mlib header, but is not a direct consumer of mlib, which is a private library for MongoDB C driver libraries"
 #endif

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

@@ -21,14 +21,6 @@
 
 #include "mongocrypt.h"
 
-struct _mongocrypt_binary_t {
-   uint8_t *data;
-   uint32_t len;
-};
-
-bool
-_mongocrypt_binary_to_bson (mongocrypt_binary_t *binary,
-                            bson_t *out) MONGOCRYPT_WARN_UNUSED_RESULT;
-
+bool _mongocrypt_binary_to_bson(mongocrypt_binary_t *binary, bson_t *out) MONGOCRYPT_WARN_UNUSED_RESULT;
 
 #endif /* MONGOCRYPT_BINARY_PRIVATE_H */

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

@@ -19,69 +19,52 @@
 #include "mongocrypt-binary-private.h"
 #include "mongocrypt-buffer-private.h"
 
-mongocrypt_binary_t *
-mongocrypt_binary_new (void)
-{
-   mongocrypt_binary_t *binary;
+mongocrypt_binary_t *mongocrypt_binary_new(void) {
+    mongocrypt_binary_t *binary;
 
-   binary = (mongocrypt_binary_t *) bson_malloc0 (sizeof *binary);
+    binary = (mongocrypt_binary_t *)bson_malloc0(sizeof *binary);
 
-   return binary;
+    return binary;
 }
 
+mongocrypt_binary_t *mongocrypt_binary_new_from_data(uint8_t *data, uint32_t len) {
+    mongocrypt_binary_t *binary;
 
-mongocrypt_binary_t *
-mongocrypt_binary_new_from_data (uint8_t *data, uint32_t len)
-{
-   mongocrypt_binary_t *binary;
+    BSON_ASSERT_PARAM(data);
 
-   BSON_ASSERT_PARAM (data);
+    binary = (mongocrypt_binary_t *)bson_malloc0(sizeof *binary);
+    BSON_ASSERT(binary);
+    binary->data = data;
+    binary->len = len;
 
-   binary = (mongocrypt_binary_t *) bson_malloc0 (sizeof *binary);
-   BSON_ASSERT (binary);
-   binary->data = data;
-   binary->len = len;
-
-   return binary;
+    return binary;
 }
 
+bool _mongocrypt_binary_to_bson(mongocrypt_binary_t *binary, bson_t *out) {
+    BSON_ASSERT_PARAM(binary);
+    BSON_ASSERT_PARAM(out);
 
-bool
-_mongocrypt_binary_to_bson (mongocrypt_binary_t *binary, bson_t *out)
-{
-   BSON_ASSERT_PARAM (binary);
-   BSON_ASSERT_PARAM (out);
-
-   return bson_init_static (out, binary->data, binary->len);
+    return bson_init_static(out, binary->data, binary->len);
 }
 
-
-uint8_t *
-mongocrypt_binary_data (const mongocrypt_binary_t *binary)
-{
-   if (!binary) {
-      return NULL;
-   }
-   return binary->data;
+uint8_t *mongocrypt_binary_data(const mongocrypt_binary_t *binary) {
+    if (!binary) {
+        return NULL;
+    }
+    return binary->data;
 }
 
-
-uint32_t
-mongocrypt_binary_len (const mongocrypt_binary_t *binary)
-{
-   if (!binary) {
-      return 0;
-   }
-   return binary->len;
+uint32_t mongocrypt_binary_len(const mongocrypt_binary_t *binary) {
+    if (!binary) {
+        return 0;
+    }
+    return binary->len;
 }
 
+void mongocrypt_binary_destroy(mongocrypt_binary_t *binary) {
+    if (!binary) {
+        return;
+    }
 
-void
-mongocrypt_binary_destroy (mongocrypt_binary_t *binary)
-{
-   if (!binary) {
-      return;
-   }
-
-   bson_free (binary);
+    bson_free(binary);
 }