[tor-commits] [tor/release-0.3.2] Updates to fix check-spaces/check-changes warnings

[nickm@xxxxxxxxxxxxxx]

commit f3af74ccf594c07f7edbf0bdfa576b9af21563d9
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Oct 24 19:35:16 2017 -0400

    Updates to fix check-spaces/check-changes warnings
---
 changes/feature18329   |  2 +-
 src/or/config.c        |  1 -
 src/test/test_config.c | 12 ++++++++----
 src/test/test_router.c |  7 +++++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/changes/feature18329 b/changes/feature18329
index f534c7614..1dabf5024 100644
--- a/changes/feature18329
+++ b/changes/feature18329
@@ -1,4 +1,4 @@
-  o Minor features:
+  o Minor features (bridge):
     - Bridge relays can now set the BridgeDistribution config option to
       add a "bridge-distribution-request" line to their bridge descriptor,
       which tells BridgeDB how they'd like their bridge address to be
diff --git a/src/or/config.c b/src/or/config.c
index 0b1e6bed1..330e8dcdd 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3355,7 +3355,6 @@ options_validate(or_options_t *old_options, or_options_t *options,
     }
   }
 
-
   if (options->MinUptimeHidServDirectoryV2 < 0) {
     log_warn(LD_CONFIG, "MinUptimeHidServDirectoryV2 option must be at "
                         "least 0 seconds. Changing to 0.");
diff --git a/src/test/test_config.c b/src/test/test_config.c
index 593d3ca8f..978a24b81 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -4893,7 +4893,8 @@ test_config_parse_port_config__ports__server_options(void *data)
 /* If we're not configured to be a bridge, but we set
  * BridgeDistribution, then options_validate () should return -1. */
 static void
-test_config_check_bridge_distribution_setting_not_a_bridge(void *arg) {
+test_config_check_bridge_distribution_setting_not_a_bridge(void *arg)
+{
   or_options_t* options = get_options_mutable();
   or_options_t* old_options = options;
   or_options_t* default_options = options;
@@ -4914,7 +4915,8 @@ test_config_check_bridge_distribution_setting_not_a_bridge(void *arg) {
 
 /* If the BridgeDistribution setting was valid, 0 should be returned. */
 static void
-test_config_check_bridge_distribution_setting_valid(void *arg) {
+test_config_check_bridge_distribution_setting_valid(void *arg)
+{
   int ret = check_bridge_distribution_setting("https");
 
   (void)arg;
@@ -4926,7 +4928,8 @@ test_config_check_bridge_distribution_setting_valid(void *arg) {
 
 /* If the BridgeDistribution setting was invalid, -1 should be returned. */
 static void
-test_config_check_bridge_distribution_setting_invalid(void *arg) {
+test_config_check_bridge_distribution_setting_invalid(void *arg)
+{
   int ret = check_bridge_distribution_setting("hyphens-are-allowed");
 
   (void)arg;
@@ -4943,7 +4946,8 @@ test_config_check_bridge_distribution_setting_invalid(void *arg) {
 /* If the BridgeDistribution setting was unrecognised, a warning should be
  * logged and 0 should be returned. */
 static void
-test_config_check_bridge_distribution_setting_unrecognised(void *arg) {
+test_config_check_bridge_distribution_setting_unrecognised(void *arg)
+{
   int ret = check_bridge_distribution_setting("unicorn");
 
   (void)arg;
diff --git a/src/test/test_router.c b/src/test/test_router.c
index 64434035e..4e96e2453 100644
--- a/src/test/test_router.c
+++ b/src/test/test_router.c
@@ -22,7 +22,8 @@ NS_DECL(const routerinfo_t *, router_get_my_routerinfo, (void));
 static routerinfo_t* mock_routerinfo;
 
 static const routerinfo_t*
-NS(router_get_my_routerinfo)(void) {
+NS(router_get_my_routerinfo)(void)
+{
   crypto_pk_t* ident_key;
   crypto_pk_t* tap_key;
   time_t now;
@@ -57,7 +58,8 @@ NS(router_get_my_routerinfo)(void) {
 /* If no distribution option was set, then check_bridge_distribution_setting()
  * should have set it to "any". */
 static void
-test_router_dump_router_to_string_no_bridge_distribution_method(void *arg) {
+test_router_dump_router_to_string_no_bridge_distribution_method(void *arg)
+{
   const char* needle = "bridge-distribution-request any";
   or_options_t* options = get_options_mutable();
   routerinfo_t* router = NULL;
@@ -107,3 +109,4 @@ struct testcase_t router_tests[] = {
   ROUTER_TEST(dump_router_to_string_no_bridge_distribution_method, TT_FORK),
   END_OF_TESTCASES
 };
+



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits