diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-12 19:20:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-12 19:20:40 -0400 |
| commit | 1f678277a17d06941ac59ebfe25502d6a160d4ef (patch) | |
| tree | 5a86beffb8000d54c8b27bd031a1da663779e5c4 /src/common/container.h | |
| parent | d1c7f65a8e76b594c63bf23baf7fb6c19ba44c00 (diff) | |
| parent | 59f9097d5c3dc010847c359888d31757d1c97904 (diff) | |
| download | tor-1f678277a17d06941ac59ebfe25502d6a160d4ef.tar.gz tor-1f678277a17d06941ac59ebfe25502d6a160d4ef.zip | |
Merge remote-tracking branch 'public/bug3122_memcmp_squashed' into maint-0.2.1
Diffstat (limited to 'src/common/container.h')
| -rw-r--r-- | src/common/container.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/container.h b/src/common/container.h index 2b9f964f76..bb7cb89fc5 100644 --- a/src/common/container.h +++ b/src/common/container.h @@ -241,7 +241,7 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join, * Example use: * SMARTLIST_FOREACH_JOIN(routerstatus_list, routerstatus_t *, rs, * routerinfo_list, routerinfo_t *, ri, - * memcmp(rs->identity_digest, ri->identity_digest, 20), + * tor_memcmp(rs->identity_digest, ri->identity_digest, 20), * log_info(LD_GENERAL,"No match for %s", ri->nickname)) { * log_info(LD_GENERAL, "%s matches routerstatus %p", ri->nickname, rs); * } SMARTLIST_FOREACH_JOIN_END(rs, ri); @@ -256,7 +256,7 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join, * ri = smartlist_get(routerinfo_list, ri_sl_idx); * while (rs_sl_idx < rs_sl_len) { * rs = smartlist_get(routerstatus_list, rs_sl_idx); - * rs_ri_cmp = memcmp(rs->identity_digest, ri->identity_digest, 20); + * rs_ri_cmp = tor_memcmp(rs->identity_digest, ri->identity_digest, 20); * if (rs_ri_cmp > 0) { * break; * } else if (rs_ri_cmp == 0) { |