diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-15 20:12:20 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-15 20:12:20 -0400 |
| commit | 68acfefbdb7a25ac1585c9480a8c98cadca50b7a (patch) | |
| tree | 42b6ff228bb1836f2309bef4ff5ef940506badff /src/common | |
| parent | ced06a80097d2c4f26b1f44447710ec33b9d2421 (diff) | |
| parent | bc44393eb59a1d303314b4b646b4d815f4eadc22 (diff) | |
| download | tor-68acfefbdb7a25ac1585c9480a8c98cadca50b7a.tar.gz tor-68acfefbdb7a25ac1585c9480a8c98cadca50b7a.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/container.h | 2 | ||||
| -rw-r--r-- | src/common/di_ops.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/common/container.h b/src/common/container.h index f5e42de764..4a6eba789d 100644 --- a/src/common/container.h +++ b/src/common/container.h @@ -261,7 +261,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, - * tor_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); diff --git a/src/common/di_ops.h b/src/common/di_ops.h index 4a212b0ca2..fa7d86806a 100644 --- a/src/common/di_ops.h +++ b/src/common/di_ops.h @@ -28,3 +28,4 @@ int tor_memeq(const void *a, const void *b, size_t sz); #define fast_memneq(a,b,c) (0!=memcmp((a),(b),(c))) #endif + |