CDRIVER-1032 move host-list fns to private header

Author: ajdavis

src/mongoc/mongoc-host-list-private.h

@@ -30,6 +30,10 @@ BSON_BEGIN_DECLS
 bool _mongoc_host_list_from_string (mongoc_host_list_t *host_list,
                                     const char         *host_and_port);
 
+bool _mongoc_host_list_equal (const mongoc_host_list_t *host_a,
+                              const mongoc_host_list_t *host_b);
+
+void _mongoc_host_list_destroy_all (mongoc_host_list_t *host);
 
 BSON_END_DECLS
 

src/mongoc/mongoc-host-list.c

@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-#include "mongoc-host-list.h"
-#include "mongoc-util-private.h"
+#include "mongoc-host-list-private.h"
 
 
 /*
  *--------------------------------------------------------------------------
  *
- * mongoc_host_list_equal --
+ * _mongoc_host_list_equal --
  *
  *       Check two hosts have the same domain (case-insensitive), port,
  *       and address family.
@@ -32,8 +31,8 @@
  *--------------------------------------------------------------------------
  */
 bool
-mongoc_host_list_equal (const mongoc_host_list_t *host_a,
-                        const mongoc_host_list_t *host_b)
+_mongoc_host_list_equal (const mongoc_host_list_t *host_a,
+                         const mongoc_host_list_t *host_b)
 {
    return (!strcasecmp (host_a->host_and_port, host_b->host_and_port)
            && host_a->family == host_b->family);
@@ -43,14 +42,14 @@ mongoc_host_list_equal (const mongoc_host_list_t *host_a,
 /*
  *--------------------------------------------------------------------------
  *
- * mongoc_host_list_destroy_all --
+ * _mongoc_host_list_destroy_all --
  *
  *       Destroy whole linked list of hosts.
  *
  *--------------------------------------------------------------------------
  */
 void
-mongoc_host_list_destroy_all (mongoc_host_list_t *host)
+_mongoc_host_list_destroy_all (mongoc_host_list_t *host)
 {
    mongoc_host_list_t *tmp;
 

src/mongoc/mongoc-host-list.h

@@ -51,11 +51,6 @@ struct _mongoc_host_list_t
    void               *padding [4];
 };
 
-bool mongoc_host_list_equal (const mongoc_host_list_t *host_a,
-                             const mongoc_host_list_t *host_b);
-
-void mongoc_host_list_destroy_all (mongoc_host_list_t *host);
-
 BSON_END_DECLS
 
 

src/mongoc/mongoc-topology-scanner.c

@@ -28,6 +28,7 @@
 #include "mongoc-counters-private.h"
 #include "utlist.h"
 #include "mongoc-topology-private.h"
+#include "mongoc-host-list-private.h"
 
 #undef MONGOC_LOG_DOMAIN
 #define MONGOC_LOG_DOMAIN "topology_scanner"
@@ -230,7 +231,7 @@ mongoc_topology_scanner_has_node_for_host (mongoc_topology_scanner_t *ts,
 
    DL_FOREACH_SAFE (ts->nodes, ele, tmp)
    {
-      if (mongoc_host_list_equal (&ele->host, host)) {
+      if (_mongoc_host_list_equal (&ele->host, host)) {
          return true;
       }
    }

src/mongoc/mongoc-uri.c

@@ -28,7 +28,6 @@
 #include "mongoc-uri-private.h"
 #include "mongoc-read-concern-private.h"
 #include "mongoc-write-concern-private.h"
-#include "mongoc-util-private.h"
 
 
 struct _mongoc_uri_t
@@ -1112,7 +1111,7 @@ void
 mongoc_uri_destroy (mongoc_uri_t *uri)
 {
    if (uri) {
-      mongoc_host_list_destroy_all (uri->hosts);
+      _mongoc_host_list_destroy_all (uri->hosts);
       bson_free(uri->str);
       bson_free(uri->database);
       bson_free(uri->username);