nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 13:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove some now-spurious blocks and indentation.

Browse Source
This commit is contained in:
Nick Mathewson 2017-01-18 15:45:02 -05:00
parent 5b97d7e110
commit 3efe8bb8ac
1 changed files with 64 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/or/entrynodes.c
View File

@ -2944,7 +2944,6 @@ num_bridges_usable(void)
{ {
int n_options = 0; int n_options = 0;
if (1) {
/* XXXX prop271 Is this quite right? */ /* XXXX prop271 Is this quite right? */
tor_assert(get_options()->UseBridges); tor_assert(get_options()->UseBridges);
guard_selection_t *gs = get_guard_selection_info(); guard_selection_t *gs = get_guard_selection_info();
@ -2959,7 +2958,6 @@ num_bridges_usable(void)
if (node && node->ri) if (node && node->ri)
++n_options; ++n_options;
} SMARTLIST_FOREACH_END(guard); } SMARTLIST_FOREACH_END(guard);
}
return n_options; return n_options;
} }
@ -3106,9 +3104,8 @@ getinfo_helper_format_single_entry_guard(const entry_guard_t *e)
char tbuf[ISO_TIME_LEN+1]; char tbuf[ISO_TIME_LEN+1];
char nbuf[MAX_VERBOSE_NICKNAME_LEN+1]; char nbuf[MAX_VERBOSE_NICKNAME_LEN+1];
if (1) { /* This is going to be a bit tricky, since the status
/* modern case. This is going to be a bit tricky, since the status * codes weren't really intended for prop271 guards.
* codes above weren't really intended for prop271 guards.
* *
* XXXX use a more appropriate format for exporting this information * XXXX use a more appropriate format for exporting this information
*/ */
@ -3125,7 +3122,7 @@ getinfo_helper_format_single_entry_guard(const entry_guard_t *e)
} else { } else {
status = "up"; status = "up";
} }
}
node = entry_guard_find_node(e); node = entry_guard_find_node(e);
if (node) { if (node) {
@ -3247,7 +3244,6 @@ const node_t *
guards_choose_guard(cpath_build_state_t *state, guards_choose_guard(cpath_build_state_t *state,
circuit_guard_state_t **guard_state_out) circuit_guard_state_t **guard_state_out)
{ {
if (1) {
const node_t *r = NULL; const node_t *r = NULL;
const uint8_t *exit_id = NULL; const uint8_t *exit_id = NULL;
entry_guard_restriction_t *rst = NULL; entry_guard_restriction_t *rst = NULL;
@ -3267,14 +3263,12 @@ guards_choose_guard(cpath_build_state_t *state,
} }
return r; return r;
} }
}
/** Helper: pick a directory guard, with whatever algorithm is used. */ /** Helper: pick a directory guard, with whatever algorithm is used. */
const node_t * const node_t *
guards_choose_dirguard(dirinfo_type_t info, guards_choose_dirguard(dirinfo_type_t info,
circuit_guard_state_t **guard_state_out) circuit_guard_state_t **guard_state_out)
{ {
if (1) {
/* XXXX prop271 We don't need to look at the dirinfo_type_t here, /* XXXX prop271 We don't need to look at the dirinfo_type_t here,
* apparently. If you look at the old implementation, and you follow info * apparently. If you look at the old implementation, and you follow info
* downwards through choose_random_dirguard(), into * downwards through choose_random_dirguard(), into
@ -3293,7 +3287,6 @@ guards_choose_dirguard(dirinfo_type_t info,
} }
return r; return r;
} }
}
/** /**
* If we're running with a constrained guard set, then maybe mark our guards * If we're running with a constrained guard set, then maybe mark our guards