CDRIVER-2060 localThreshold code cleanups

Author: ajdavis

src/mongoc/mongoc-uri.c

@@ -1228,7 +1228,6 @@ mongoc_uri_get_local_threshold_option (const mongoc_uri_t *uri)
    if ((options = mongoc_uri_get_options (uri)) &&
        bson_iter_init_find_case (&iter, options, "localthresholdms") &&
        BSON_ITER_HOLDS_INT32 (&iter)) {
-
       retval = bson_iter_int32 (&iter);
 
       if (retval < 0) {

tests/test-mongoc-uri.c

@@ -879,43 +879,46 @@ test_mongoc_uri_long_hostname (void)
    bson_free (host_and_port);
    bson_free (host);
 }
+
+static void
 test_mongoc_uri_local_threshold_ms (void)
 {
    mongoc_uri_t *uri;
 
    uri = mongoc_uri_new ("mongodb://localhost/");
 
    /* localthresholdms isn't set, return the default */
-   ASSERT_CMPINT (mongoc_uri_get_local_threshold_option (uri), ==,
-                  MONGOC_TOPOLOGY_LOCAL_THRESHOLD_MS);
-      ASSERT (
+   ASSERT_CMPINT (mongoc_uri_get_local_threshold_option (uri),
+      ==,MONGOC_TOPOLOGY_LOCAL_THRESHOLD_MS);
+   ASSERT (
       mongoc_uri_set_option_as_int32 (uri, "localthresholdms", 99));
    ASSERT_CMPINT (mongoc_uri_get_local_threshold_option (uri), ==, 99);
 
-   mongoc_uri_destroy(uri);
+   mongoc_uri_destroy (uri);
 
 
-   uri = mongoc_uri_new ("mongodb://localhost/?localthresholdms=0");
+   uri = mongoc_uri_new (
+      "mongodb://localhost/?localthresholdms=0");
 
    ASSERT_CMPINT (mongoc_uri_get_local_threshold_option (uri), ==, 0);
       ASSERT (
       mongoc_uri_set_option_as_int32 (uri, "localthresholdms", 99));
    ASSERT_CMPINT (mongoc_uri_get_local_threshold_option (uri), ==, 99);
 
-   mongoc_uri_destroy(uri);
-
+   mongoc_uri_destroy (uri);
 
-   uri = mongoc_uri_new(
-      "mongodb://localhost/?" MONGOC_URI_LOCALTHRESHOLDMS "=-1");
+   uri = mongoc_uri_new ("mongodb://localhost/?localthresholdms=-1");
 
    /* localthresholdms is invalid, return the default */
    capture_logs (true);
-   ASSERT_CMPINT (mongoc_uri_get_local_threshold_option (uri), ==,
-      MONGOC_TOPOLOGY_LOCAL_THRESHOLD_MS);
+   ASSERT_CMPINT (mongoc_uri_get_local_threshold_option (uri),
+                  ==,
+                  MONGOC_TOPOLOGY_LOCAL_THRESHOLD_MS);
    ASSERT_CAPTURED_LOG ("mongoc_uri_get_local_threshold_option",
-      MONGOC_LOG_LEVEL_WARNING, "Invalid localThresholdMS: -1");
+                        MONGOC_LOG_LEVEL_WARNING,
+                        "Invalid localThresholdMS: -1");
 
-   mongoc_uri_destroy(uri);
+   mongoc_uri_destroy (uri);
 }
 
 
@@ -932,5 +935,6 @@ test_uri_install (TestSuite *suite)
    TestSuite_Add (suite, "/Uri/functions", test_mongoc_uri_functions);
    TestSuite_Add (suite, "/Uri/compound_setters", test_mongoc_uri_compound_setters);
    TestSuite_Add (suite, "/Uri/long_hostname", test_mongoc_uri_long_hostname);
-   TestSuite_Add (suite, "/Uri/local_threshold_ms", test_mongoc_uri_local_threshold_ms);
+   TestSuite_Add (
+      suite, "/Uri/local_threshold_ms", test_mongoc_uri_local_threshold_ms);
 }