Updates to fix check-spaces/check-changes warnings
This commit is contained in:
parent
44e8aaa9aa
commit
f3af74ccf5
|
@ -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
|
||||
|
|
|
@ -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.");
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue