aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-06-23 15:51:48 -0400
committerNick Mathewson <nickm@torproject.org>2012-06-23 15:54:01 -0400
commita6688c574e569a2a018038414198ab440344ba95 (patch)
tree01d47f7c81d3ff01166db55c61dd5637262bc297 /src/or/circuitbuild.c
parentce44346aa5b4dddf37aff992755ef472d0d1f5a2 (diff)
downloadtor-a6688c574e569a2a018038414198ab440344ba95.tar
tor-a6688c574e569a2a018038414198ab440344ba95.tar.gz
Catch a few more K&R violations with make check-spaces
We now catch bare {s that should be on the previous line with a do, while, if, or for, and elses that should share a line with their preceding }. That is, if (foo) { and if (foo) { ... } else are now detected. We should think about maybe making Tor uncrustify-clean some day, but configuring uncrustify is an exercise in bizarreness, and reformatting huge gobs of Tor is always painful.
Diffstat (limited to 'src/or/circuitbuild.c')
-rw-r--r--src/or/circuitbuild.c3
1 files changed, 1 insertions, 2 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,