aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_util.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-07-18 10:14:40 -0400
committerNick Mathewson <nickm@torproject.org>2012-07-18 10:14:40 -0400
commitf8c9cc713d608fcd37d25730e91a88d4a1081f28 (patch)
tree66511f361dc9eb1915a7cc469f1001cf57337dbb /src/test/test_util.c
parentec8bdc5da81a27fd0d382db689addd8114347e1e (diff)
parentb355ddb20f534d772dcb42737ceb1d0264e2c3f1 (diff)
downloadtor-f8c9cc713d608fcd37d25730e91a88d4a1081f28.tar.gz
tor-f8c9cc713d608fcd37d25730e91a88d4a1081f28.zip
Merge remote-tracking branch 'origin/maint-0.2.3'
Diffstat (limited to 'src/test/test_util.c')
-rw-r--r--src/test/test_util.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 79573f5392..5c119d339b 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -2679,8 +2679,7 @@ test_util_split_lines(void *ptr)
j = 0;
log_info(LD_GENERAL, "Splitting test %d of length %d",
i, tests[i].orig_length);
- SMARTLIST_FOREACH(sl, const char *, line,
- {
+ SMARTLIST_FOREACH_BEGIN(sl, const char *, line) {
/* Check we have not got too many lines */
test_assert(j < MAX_SPLIT_LINE_COUNT);
/* Check that there actually should be a line here */
@@ -2690,7 +2689,7 @@ test_util_split_lines(void *ptr)
/* Check that the line is as expected */
test_streq(line, tests[i].split_line[j]);
j++;
- });
+ } SMARTLIST_FOREACH_END(line);
/* Check that we didn't miss some lines */
test_eq_ptr(NULL, tests[i].split_line[j]);
tor_free(orig_line);