summaryrefslogtreecommitdiff
path: root/src/test/test_util.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-07-18 10:14:14 -0400
committerNick Mathewson <nickm@torproject.org>2012-07-18 10:14:14 -0400
commitb355ddb20f534d772dcb42737ceb1d0264e2c3f1 (patch)
tree5bf4f320dff8263d2168454207aeb63f85ec962e /src/test/test_util.c
parent4cac5df5548e0051a6927a778da3e6f01f45dc56 (diff)
parent78dec943074c26747abc7a68cd6aec5269100569 (diff)
downloadtor-b355ddb20f534d772dcb42737ceb1d0264e2c3f1.tar.gz
tor-b355ddb20f534d772dcb42737ceb1d0264e2c3f1.zip
Merge branch 'smartlist_shorten' into 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 632ef68bd6..9eca90492d 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -2604,8 +2604,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 */
@@ -2615,7 +2614,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);