cleanups for PR-177

* moving mongoc_client_pool_get_size() to a private header
* code formatting
* moving variables to the top of the block for msvc

Closes #177

Author: hanumantmk

src/mongoc/Makefile.am

@@ -24,6 +24,7 @@ INST_H_FILES = \
 	src/mongoc/mongoc-bulk-operation-private.h \
 	src/mongoc/mongoc-bulk-operation.h \
 	src/mongoc/mongoc-client-pool.h \
+	src/mongoc/mongoc-client-pool-private.h \
 	src/mongoc/mongoc-client-private.h \
 	src/mongoc/mongoc-client.h \
 	src/mongoc/mongoc-cluster-private.h \

src/mongoc/mongoc-client-pool-private.h

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef MONGOC_CLIENT_POOL_PRIVATE_H
+#define MONGOC_CLIENT_POOL_PRIVATE_H
+
+#if !defined (MONGOC_I_AM_A_DRIVER) && !defined (MONGOC_COMPILATION)
+#error "Only <mongoc.h> can be included directly."
+#endif
+
+#include <bson.h>
+
+#include "mongoc-client-pool.h"
+
+BSON_BEGIN_DECLS
+
+size_t 				  mongoc_client_pool_get_size(mongoc_client_pool_t *pool);
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_CLIENT_POOL_PRIVATE_H */

src/mongoc/mongoc-client-pool.c

@@ -205,14 +205,14 @@ mongoc_client_pool_push (mongoc_client_pool_t *pool,
       pool->size--;
    }
 
-   if ((client->cluster.state == MONGOC_CLUSTER_STATE_HEALTHY) || 
+   if ((client->cluster.state == MONGOC_CLUSTER_STATE_HEALTHY) ||
        (client->cluster.state == MONGOC_CLUSTER_STATE_BORN)) {
       mongoc_mutex_lock (&pool->mutex);
       _mongoc_queue_push_tail (&pool->queue, client);
    } else if (_mongoc_cluster_reconnect (&client->cluster, NULL)) {
       mongoc_mutex_lock (&pool->mutex);
       _mongoc_queue_push_tail (&pool->queue, client);
-   }else {
+   } else {
       mongoc_client_destroy (client);
       mongoc_mutex_lock (&pool->mutex);
       pool->size--;
@@ -227,15 +227,15 @@ mongoc_client_pool_push (mongoc_client_pool_t *pool,
 size_t
 mongoc_client_pool_get_size (mongoc_client_pool_t *pool)
 {
+   size_t size = 0;
+
    ENTRY;
 
    bson_return_if_fail (pool);
 
-   size_t size = 0;
-
    mongoc_mutex_lock (&pool->mutex);
    size = pool->size;
    mongoc_mutex_unlock (&pool->mutex);
 
-   RETURN (size);   
+   RETURN (size);
 }

src/mongoc/mongoc-client-pool.h

@@ -48,7 +48,6 @@ void                  mongoc_client_pool_set_ssl_opts (mongoc_client_pool_t   *p
                                                        const mongoc_ssl_opt_t *opts);
 #endif
 
-size_t 				  mongoc_client_pool_get_size(mongoc_client_pool_t *pool);
 
 BSON_END_DECLS
 

tests/test-mongoc-client-pool.c

@@ -1,4 +1,5 @@
 #include <mongoc.h>
+#include "mongoc-client-pool-private.h"
 #include "mongoc-array-private.h"
 
 
@@ -48,29 +49,29 @@ test_mongoc_client_pool_min_size_dispose (void)
    mongoc_array_t conns;
    int i;
 
-   _mongoc_array_init(&conns, sizeof client);
+   _mongoc_array_init (&conns, sizeof client);
 
-   uri = mongoc_uri_new("mongodb://127.0.0.1?maxpoolsize=10&minpoolsize=3");
-   pool = mongoc_client_pool_new(uri);
+   uri = mongoc_uri_new ("mongodb://127.0.0.1?maxpoolsize=10&minpoolsize=3");
+   pool = mongoc_client_pool_new (uri);
 
    for (i = 0; i < 10; i++) {
-      client = mongoc_client_pool_pop(pool);
-      assert(client);
-      _mongoc_array_append_val(&conns, client);
-      assert(mongoc_client_pool_get_size(pool) == i+1);
+      client = mongoc_client_pool_pop (pool);
+      assert (client);
+      _mongoc_array_append_val (&conns, client);
+      assert (mongoc_client_pool_get_size (pool) == i + 1);
    }
-   
+
    for (i = 0; i < 10; i++) {
-      client = _mongoc_array_index(&conns,mongoc_client_t *, i);
-      assert(client);
-      mongoc_client_pool_push(pool, client);
+      client = _mongoc_array_index (&conns, mongoc_client_t *, i);
+      assert (client);
+      mongoc_client_pool_push (pool, client);
    }
 
-   assert(mongoc_client_pool_get_size(pool) == 3);
-   _mongoc_array_clear(&conns);
-   _mongoc_array_destroy(&conns);
-   mongoc_uri_destroy(uri);
-   mongoc_client_pool_destroy(pool);
+   assert (mongoc_client_pool_get_size (pool) == 3);
+   _mongoc_array_clear (&conns);
+   _mongoc_array_destroy (&conns);
+   mongoc_uri_destroy (uri);
+   mongoc_client_pool_destroy (pool);
 }
 
 void