Updates to fix check-spaces/check-changes warnings

diff --git a/changes/feature18329 b/changes/feature18329
index f534c76145e50c680c8db32063f3f27b3a23e577..1dabf5024412d12ebd1d6357e8f689574c1690d4 100644 (file)
--- 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 0b1e6bed146232deb2f68a2ae1ee5fca00544a0d..330e8dcdd739ac52fec01ff48092c01e67709db1 100644 (file)
--- 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 593d3ca8f2f096290a57160ea4c027f3213447e7..978a24b8163e449631c8fe6f271cd1af9298bf2b 100644 (file)
--- 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 64434035ef4cf726bf6dc1c7700c80ac629be382..4e96e2453469af00b7c55fec4a8cef4775c3d481 100644 (file)
--- 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
 };
+