Remove mlib for now

Author: vector-of-bool

src/libmongoc/CMakeLists.txt

@@ -761,7 +761,6 @@ endif ()
 add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING})
 set_target_properties (mongoc_shared PROPERTIES CMAKE_CXX_VISIBILITY_PRESET hidden)
 target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC ${BSON_LIBRARIES})
-targets_use_mlib (mongoc_shared)
 target_include_directories (mongoc_shared BEFORE PUBLIC ${MONGOC_INTERNAL_INCLUDE_DIRS})
 target_include_directories (mongoc_shared PRIVATE ${ZLIB_INCLUDE_DIRS})
 target_include_directories (mongoc_shared PRIVATE ${LIBMONGOCRYPT_INCLUDE_DIRECTORIES})
@@ -800,7 +799,6 @@ set_target_properties (mongoc_shared PROPERTIES OUTPUT_NAME "${MONGOC_OUTPUT_BAS
 if (MONGOC_ENABLE_STATIC_BUILD)
    add_library (mongoc_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING})
    target_link_libraries (mongoc_static PUBLIC ${STATIC_LIBRARIES} ${BSON_STATIC_LIBRARIES})
-   targets_use_mlib (mongoc_static)
    if (NOT WIN32 AND ENABLE_PIC)
       target_compile_options (mongoc_static PUBLIC -fPIC)
       message ("Adding -fPIC to compilation of mongoc_static components")
@@ -1059,9 +1057,7 @@ endif ()
 mongoc_add_test (test-libmongoc FALSE ${test-libmongoc-sources})
 mongoc_add_test (test-mongoc-gssapi FALSE ${PROJECT_SOURCE_DIR}/tests/test-mongoc-gssapi.c)
 mongoc_add_test (test-mongoc-cache FALSE ${PROJECT_SOURCE_DIR}/tests/test-mongoc-cache.c)
-if (TARGET test-libmongoc)
-targets_use_mlib (test-libmongoc)
-endif ()
+
 
 if (ENABLE_TESTS)
    # "make test" doesn't compile tests, so we create "make check" which compiles

src/libmongoc/src/mongoc/mongoc-client-side-encryption.c

@@ -1192,8 +1192,8 @@ _parse_extra (const bson_t *extra,
          }
          uint32_t len;
          const char *ptr = bson_iter_utf8 (&iter, &len);
-         mstr_assign (&topology->csfle_override_path,
-                      mstr_copy_data (ptr, len));
+         bson_free (topology->csfle_override_path);
+         topology->csfle_override_path = bson_strdup (ptr);
       }
 
       if (bson_iter_init_find (&iter, extra, "csfleRequired")) {
@@ -1310,7 +1310,7 @@ _mongoc_cse_client_enable_auto_encryption (mongoc_client_t *client,
       _mongoc_crypt_new (opts->kms_providers,
                          opts->schema_map,
                          opts->tls_opts,
-                         client->topology->csfle_override_path.view,
+                         client->topology->csfle_override_path,
                          client->topology->csfle_required,
                          error);
    if (!client->topology->crypt) {
@@ -1458,7 +1458,7 @@ _mongoc_cse_client_pool_enable_auto_encryption (
    topology->crypt = _mongoc_crypt_new (opts->kms_providers,
                                         opts->schema_map,
                                         opts->tls_opts,
-                                        topology->csfle_override_path.view,
+                                        topology->csfle_override_path,
                                         topology->csfle_required,
                                         error);
    if (!topology->crypt) {
@@ -1551,7 +1551,7 @@ mongoc_client_encryption_new (mongoc_client_encryption_opts_t *opts,
    client_encryption->crypt = _mongoc_crypt_new (opts->kms_providers,
                                                  NULL /* schema_map */,
                                                  opts->tls_opts,
-                                                 MSTRV_NULL /* No csfle path */,
+                                                 NULL /* No csfle path */,
                                                  false /* csfle not requried */,
                                                  error);
    if (!client_encryption->crypt) {

src/libmongoc/src/mongoc/mongoc-crypt-private.h

@@ -25,8 +25,6 @@
 
 #include "mongoc.h"
 
-#include <mlib/str.h>
-
 /* For interacting with libmongocrypt */
 typedef struct __mongoc_crypt_t _mongoc_crypt_t;
 
@@ -39,7 +37,7 @@ _mongoc_crypt_t *
 _mongoc_crypt_new (const bson_t *kms_providers,
                    const bson_t *schema_map,
                    const bson_t *tls_opts,
-                   mstr_view csfle_override_path,
+                   const char *csfle_override_path,
                    bool csfle_required,
                    bson_error_t *error);
 

src/libmongoc/src/mongoc/mongoc-crypt.c

@@ -910,7 +910,7 @@ _mongoc_crypt_t *
 _mongoc_crypt_new (const bson_t *kms_providers,
                    const bson_t *schema_map,
                    const bson_t *tls_opts,
-                   mstr_view csfle_override_path,
+                   const char *csfle_override_path,
                    bool csfle_required,
                    bson_error_t *error)
 {
@@ -952,9 +952,9 @@ _mongoc_crypt_new (const bson_t *kms_providers,
       goto fail;
    }
 
-   if (csfle_override_path.data != NULL) {
+   if (csfle_override_path != NULL) {
       mongocrypt_setopt_set_csfle_lib_path_override (crypt->handle,
-                                                     csfle_override_path.data);
+                                                     csfle_override_path);
       if (!_crypt_check_error (crypt->handle, error, false)) {
          goto fail;
       }
@@ -966,9 +966,8 @@ _mongoc_crypt_new (const bson_t *kms_providers,
    }
 
    if (csfle_required) {
-      mstr_view s = mstrv_view_cstr (
-         mongocrypt_csfle_version_string (crypt->handle, NULL));
-      if (s.len == 0) {
+      const char *s = mongocrypt_csfle_version_string (crypt->handle, NULL);
+      if (!s || strlen (s) == 0) {
          // empty/null version string indicates that csfle was not loaded by
          // libmongocrypt
          bson_set_error (error,
@@ -981,7 +980,7 @@ _mongoc_crypt_new (const bson_t *kms_providers,
       mongoc_log (MONGOC_LOG_LEVEL_DEBUG,
                   MONGOC_LOG_DOMAIN,
                   "csfle version '%s' was found and loaded",
-                  s.data);
+                  s);
    }
 
    success = true;

src/libmongoc/src/mongoc/mongoc-topology-private.h

@@ -30,8 +30,6 @@
 #include "mongoc-ts-pool-private.h"
 #include "mongoc-shared-private.h"
 
-#include <mlib/str.h>
-
 #define MONGOC_TOPOLOGY_MIN_HEARTBEAT_FREQUENCY_MS 500
 #define MONGOC_TOPOLOGY_SOCKET_CHECK_INTERVAL_MS 5000
 #define MONGOC_TOPOLOGY_COOLDOWN_MS 5000
@@ -190,7 +188,7 @@ typedef struct _mongoc_topology_t {
 #endif
 
    // Corresponds to extraOptions.csflePath
-   mstr csfle_override_path;
+   char *csfle_override_path;
    // Corresponds to extraOptions.csfleRequired
    bool csfle_required;
 

src/libmongoc/src/mongoc/mongoc-topology.c

@@ -696,7 +696,7 @@ mongoc_topology_destroy (mongoc_topology_t *topology)
    mongoc_shared_ptr_reset_null (&topology->_shared_descr_._sptr_);
    mongoc_topology_scanner_destroy (topology->scanner);
    mongoc_server_session_pool_free (topology->session_pool);
-   mstr_free (topology->csfle_override_path);
+   bson_free (topology->csfle_override_path);
 
    mongoc_cond_destroy (&topology->cond_client);
    bson_mutex_destroy (&topology->tpld_modification_mtx);