aboutsummaryrefslogtreecommitdiff
path: root/src/or/nodelist.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-07-11 11:21:47 -0400
committerNick Mathewson <nickm@torproject.org>2011-07-11 11:21:47 -0400
commite158f8de4b487450adeb89de204898263f6a87a5 (patch)
tree1fef7d1c700208ead34667200f138088635481b8 /src/or/nodelist.h
parent60832766ac19e8f027455d23254e376042c21ef2 (diff)
downloadtor-e158f8de4b487450adeb89de204898263f6a87a5.tar
tor-e158f8de4b487450adeb89de204898263f6a87a5.tar.gz
Rename and tweak nodelist_add_node_family() to add node
It's very easy for nodelist_add_node_family(sl,node) to accidentally add 'node', and kind of hard to make sure that it omits it. Instead of taking pains to leave 'node' out, let's instead make sure that we always include it. I also rename the function to nodelist_add_node_and_family, and audit its users so that they don't add the node itself any longer, since the function will take care of that for them. Resolves bug 2616, which was not actually a bug.
Diffstat (limited to 'src/or/nodelist.h')
-rw-r--r--src/or/nodelist.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/nodelist.h b/src/or/nodelist.h
index 08f11da59..bd2e63953 100644
--- a/src/or/nodelist.h
+++ b/src/or/nodelist.h
@@ -53,7 +53,7 @@ smartlist_t *nodelist_get_list(void);
/* XXXX These need to move out of routerlist.c */
void nodelist_refresh_countries(void);
void node_set_country(node_t *node);
-void nodelist_add_node_family(smartlist_t *nodes, const node_t *node);
+void nodelist_add_node_and_family(smartlist_t *nodes, const node_t *node);
int nodes_in_same_family(const node_t *node1, const node_t *node2);
#endif