Rename mongoc_topology_description_destroy to cleanup

Author: jmikola

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

@@ -144,7 +144,7 @@ _mongoc_topology_description_monitor_opening (mongoc_topology_description_t *td)
    }
 
    if (prev_td) {
-      mongoc_topology_description_destroy (prev_td);
+      mongoc_topology_description_cleanup (prev_td);
       bson_free (prev_td);
    }
 }

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

@@ -73,7 +73,7 @@ _mongoc_topology_description_copy_to (const mongoc_topology_description_t *src,
                                       mongoc_topology_description_t *dst);
 
 void
-mongoc_topology_description_destroy (
+mongoc_topology_description_cleanup (
    mongoc_topology_description_t *description);
 
 void

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

@@ -104,7 +104,7 @@ mongoc_topology_description_init (mongoc_topology_description_t *description,
  *
  *       Deep-copy @src to an uninitialized topology description @dst.
  *       @dst must not already point to any allocated resources. Clean
- *       up with mongoc_topology_description_destroy.
+ *       up with mongoc_topology_description_cleanup.
  *
  *       WARNING: @dst's rand_seed is not initialized.
  *
@@ -166,9 +166,9 @@ _mongoc_topology_description_copy_to (const mongoc_topology_description_t *src,
 /*
  *--------------------------------------------------------------------------
  *
- * mongoc_topology_description_destroy --
+ * mongoc_topology_description_cleanup --
  *
- *       Destroy allocated resources within @description
+ *       Destroy allocated resources within @description but don't free it.
  *
  * Returns:
  *       None.
@@ -179,7 +179,7 @@ _mongoc_topology_description_copy_to (const mongoc_topology_description_t *src,
  *--------------------------------------------------------------------------
  */
 void
-mongoc_topology_description_destroy (mongoc_topology_description_t *description)
+mongoc_topology_description_cleanup (mongoc_topology_description_t *description)
 {
    ENTRY;
 
@@ -1984,7 +1984,7 @@ mongoc_topology_description_handle_hello (
              &sd->topology_version, &incoming_topology_version) == 1) {
          TRACE ("%s", "topology version is strictly less. Skipping.");
          if (prev_td) {
-            mongoc_topology_description_destroy (prev_td);
+            mongoc_topology_description_cleanup (prev_td);
             bson_free (prev_td);
          }
          return;
@@ -2070,7 +2070,7 @@ mongoc_topology_description_handle_hello (
    }
 
    if (prev_td) {
-      mongoc_topology_description_destroy (prev_td);
+      mongoc_topology_description_cleanup (prev_td);
       bson_free (prev_td);
    }
 

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

@@ -567,7 +567,7 @@ mongoc_topology_destroy (mongoc_topology_t *topology)
    _mongoc_topology_description_monitor_closed (&topology->description);
 
    mongoc_uri_destroy (topology->uri);
-   mongoc_topology_description_destroy (&topology->description);
+   mongoc_topology_description_cleanup (&topology->description);
    mongoc_topology_scanner_destroy (topology->scanner);
 
    /* If we are single-threaded, the client will try to call

src/libmongoc/tests/json-test.c

@@ -543,7 +543,7 @@ test_server_selection_logic_cb (bson_t *test)
 
 DONE:
    mongoc_read_prefs_destroy (read_prefs);
-   mongoc_topology_description_destroy (&topology);
+   mongoc_topology_description_cleanup (&topology);
    _mongoc_array_destroy (&selected_servers);
 }
 

src/libmongoc/tests/test-mongoc-dns.c

@@ -579,7 +579,7 @@ test_srv_polling_mocked (void *unused)
    _mongoc_host_list_destroy_all (hosts);
    ASSERT_CAPTURED_LOG ("topology", MONGOC_LOG_LEVEL_ERROR, "Invalid host");
 
-   mongoc_topology_description_destroy (&td);
+   mongoc_topology_description_cleanup (&td);
    mongoc_uri_destroy (uri);
 }