aboutsummaryrefslogtreecommitdiff
path: root/src/or/nodelist.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/nodelist.c
parentce44346aa5b4dddf37aff992755ef472d0d1f5a2 (diff)
downloadtor-a6688c574e569a2a018038414198ab440344ba95.tar.gz
tor-a6688c574e569a2a018038414198ab440344ba95.zip
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/nodelist.c')
-rw-r--r--src/or/nodelist.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index f7f3024179..d17850888d 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;
}