From 7b8980a43ca6b095f368282224332035d60a82e2 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 19 Oct 2005 03:08:50 +0000 Subject: [PATCH] Make it compile. appease roger and his thirst for documentation. svn:r5289 --- src/or/routerlist.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 0208613154..2b62713c1b 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1115,7 +1115,7 @@ routerlist_insert(routerlist_t *rl, routerinfo_t *ri) * as needed. If idx is nonnegative and smartlist_get(rl->routers, * idx) == ri, we don't need to do a linear search over the list to decide * which to remove. We fill the gap rl->routers with a later element in - * the list, if any exists. */ + * the list, if any exists. ri_old is not freed.*/ void routerlist_remove(routerlist_t *rl, routerinfo_t *ri, int idx) { @@ -1136,6 +1136,11 @@ routerlist_remove(routerlist_t *rl, routerinfo_t *ri, int idx) // routerlist_assert_ok(rl); } +/** Remove ri_old from the routerlist rl, and replace it with + * ri_new, updating all index info. If idx is nonnegative and + * smartlist_get(rl->routers, idx) == ri, we don't need to do a linear + * search over the list to decide which to remove. We put ri_new in the same + * index as ri_old, if possible. ri_old is not freed.*/ static void routerlist_replace(routerlist_t *rl, routerinfo_t *ri_old, routerinfo_t *ri_new, int idx) @@ -1153,7 +1158,7 @@ routerlist_replace(routerlist_t *rl, routerinfo_t *ri_old, } else { smartlist_add(rl->routers, ri_new); } - if (memcmp(ri_old->identity_digest, ri->new_identity_digest)) { + if (memcmp(ri_old->identity_digest, ri_new->identity_digest, DIGEST_LEN)) { /* digests don't match; digestmap_set won't replace */ digestmap_remove(rl->identity_map, ri_old->identity_digest); }