nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-01 08:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.4'

Browse Source
This commit is contained in:
Nick Mathewson 2013-03-21 07:53:46 -04:00
commit 294c89f238
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/test/test_util.c
View File

@ -860,7 +860,7 @@ test_util_strmisc(void)
{ {
char buf[1024]; char buf[1024];
int i; int i;
char *cp; char *cp, *cp_tmp;
/* Test strl operations */ /* Test strl operations */
test_eq(5, strlcpy(buf, "Hello", 0)); test_eq(5, strlcpy(buf, "Hello", 0));
@ -1063,20 +1063,20 @@ test_util_strmisc(void)
/* Test strndup and memdup */ /* Test strndup and memdup */
{ {
const char *s = "abcdefghijklmnopqrstuvwxyz"; const char *s = "abcdefghijklmnopqrstuvwxyz";
cp = tor_strndup(s, 30); cp_tmp = tor_strndup(s, 30);
test_streq(cp, s); /* same string, */ test_streq(cp_tmp, s); /* same string, */
test_neq_ptr(cp, s); /* but different pointers. */ test_neq_ptr(cp_tmp, s); /* but different pointers. */
tor_free(cp); tor_free(cp_tmp);
cp = tor_strndup(s, 5); cp_tmp = tor_strndup(s, 5);
test_streq(cp, "abcde"); test_streq(cp_tmp, "abcde");
tor_free(cp); tor_free(cp_tmp);
s = "a\0b\0c\0d\0e\0"; s = "a\0b\0c\0d\0e\0";
cp = tor_memdup(s,10); cp_tmp = tor_memdup(s,10);
test_memeq(cp, s, 10); /* same ram, */ test_memeq(cp_tmp, s, 10); /* same ram, */
test_neq_ptr(cp, s); /* but different pointers. */ test_neq_ptr(cp_tmp, s); /* but different pointers. */
tor_free(cp); tor_free(cp_tmp);
} }
/* Test str-foo functions */ /* Test str-foo functions */
@ -1155,7 +1155,7 @@ test_util_strmisc(void)
tt_int_op(strcmp_len("blah", "", 0), ==, 0); tt_int_op(strcmp_len("blah", "", 0), ==, 0);
done: done:
; tor_free(cp_tmp);
} }
static void static void