aboutsummaryrefslogtreecommitdiff
path: root/src/or/routerlist.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-11 16:27:27 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-11 16:27:27 -0400
commit0cbcbc3412b667537b6ec54da0a4c9173a19d6de (patch)
tree6cf0e59b26854a49be2326d49f57189a48e31b60 /src/or/routerlist.c
parent9964c314c6c6af4b921875c973f28f8d01b2e9a2 (diff)
downloadtor-0cbcbc3412b667537b6ec54da0a4c9173a19d6de.tar.gz
tor-0cbcbc3412b667537b6ec54da0a4c9173a19d6de.zip
Re-apply the automated conversion to 0.2.2 to make handle any memcmps that snuck in
Diffstat (limited to 'src/or/routerlist.c')
-rw-r--r--src/or/routerlist.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index b0909eb730..c54025b8b0 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -3083,7 +3083,7 @@ routerlist_replace(routerlist_t *rl, routerinfo_t *ri_old,
&ri_new->cache_info);
}
- same_descriptors = ! memcmp(ri_old->cache_info.signed_descriptor_digest,
+ same_descriptors = tor_memeq(ri_old->cache_info.signed_descriptor_digest,
ri_new->cache_info.signed_descriptor_digest,
DIGEST_LEN);
@@ -3105,7 +3105,7 @@ routerlist_replace(routerlist_t *rl, routerinfo_t *ri_old,
sdmap_remove(rl->desc_digest_map,
ri_old->cache_info.signed_descriptor_digest);
- if (memcmp(ri_old->cache_info.extra_info_digest,
+ if (tor_memcmp(ri_old->cache_info.extra_info_digest,
ri_new->cache_info.extra_info_digest, DIGEST_LEN)) {
ei_tmp = eimap_remove(rl->extra_info_map,
ri_old->cache_info.extra_info_digest);