diff options
author | David Goulet <dgoulet@torproject.org> | 2019-05-07 08:02:39 -0400 |
---|---|---|
committer | David Goulet <dgoulet@torproject.org> | 2019-05-07 08:02:39 -0400 |
commit | b72f5da03d12e0ac2212d18e3dea309d23ded79c (patch) | |
tree | 82789d2222286e6b5500cb357448def627171df9 /src/test/test_util.c | |
parent | c8c64caf371c2960bf217fc10d2353144e7e24b3 (diff) | |
parent | 295feeb09377c4d78f9ee43ec3197b908d7cb960 (diff) | |
download | tor-b72f5da03d12e0ac2212d18e3dea309d23ded79c.tar.gz tor-b72f5da03d12e0ac2212d18e3dea309d23ded79c.zip |
Merge branch 'tor-github/pr/994'
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/test/test_util.c')
-rw-r--r-- | src/test/test_util.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/test/test_util.c b/src/test/test_util.c index 88eda847a2..79df2825be 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2087,14 +2087,14 @@ test_util_strmisc(void *arg) /* Test mem_is_zero */ memset(buf,0,128); buf[128] = 'x'; - tt_assert(tor_mem_is_zero(buf, 10)); - tt_assert(tor_mem_is_zero(buf, 20)); - tt_assert(tor_mem_is_zero(buf, 128)); - tt_assert(!tor_mem_is_zero(buf, 129)); + tt_assert(fast_mem_is_zero(buf, 10)); + tt_assert(fast_mem_is_zero(buf, 20)); + tt_assert(fast_mem_is_zero(buf, 128)); + tt_assert(!fast_mem_is_zero(buf, 129)); buf[60] = (char)255; - tt_assert(!tor_mem_is_zero(buf, 128)); + tt_assert(!fast_mem_is_zero(buf, 128)); buf[0] = (char)1; - tt_assert(!tor_mem_is_zero(buf, 10)); + tt_assert(!fast_mem_is_zero(buf, 10)); /* Test 'escaped' */ tt_ptr_op(escaped(NULL), OP_EQ, NULL); @@ -3789,7 +3789,7 @@ test_util_memarea(void *arg) tt_int_op(((uintptr_t)p3) % sizeof(void*),OP_EQ, 0); tt_assert(!memarea_owns_ptr(area, p3+8192)); tt_assert(!memarea_owns_ptr(area, p3+30)); - tt_assert(tor_mem_is_zero(p2, 52)); + tt_assert(fast_mem_is_zero(p2, 52)); /* Make sure we don't overalign. */ p1 = memarea_alloc(area, 1); p2 = memarea_alloc(area, 1); |