aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/or/circuitbuild.c3
-rw-r--r--src/or/main.c3
-rw-r--r--src/or/nodelist.c3
3 files changed, 3 insertions, 6 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index cfd1956e5..074b78d96 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -5602,8 +5602,7 @@ rewrite_node_address_for_bridge(const bridge_info_t *bridge, node_t *node)
/* XXXipv6 we lack support for falling back to another address for
the same relay, warn the user */
- if (!tor_addr_is_null(&ri->ipv6_addr))
- {
+ if (!tor_addr_is_null(&ri->ipv6_addr)) {
tor_addr_port_t ap;
router_get_pref_orport(ri, &ap);
log_notice(LD_CONFIG,
diff --git a/src/or/main.c b/src/or/main.c
index 1f3117b23..95ac8d616 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2597,8 +2597,7 @@ tor_main(int argc, char *argv[])
// a file on a folder shared by the wm emulator.
// if no flashcard (real or emulated) is present,
// log files will be written in the root folder
- if (find_flashcard_path(path,MAX_PATH) == -1)
- {
+ if (find_flashcard_path(path,MAX_PATH) == -1) {
redir = _wfreopen( L"\\stdout.log", L"w", stdout );
redirdbg = _wfreopen( L"\\stderr.log", L"w", stderr );
} else {
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index f7f302417..d17850888 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -689,8 +689,7 @@ node_get_prim_orport(const node_t *node, tor_addr_port_t *ap_out)
{
if (node->ri) {
router_get_prim_orport(node->ri, ap_out);
- }
- else if (node->rs) {
+ } else if (node->rs) {
tor_addr_from_ipv4h(&ap_out->addr, node->rs->addr);
ap_out->port = node->rs->or_port;
}