summaryrefslogtreecommitdiff
path: root/src/test/test.c
diff options
context:
space:
mode:
authorAlexander Færøy <ahf@torproject.org>2017-06-05 14:38:20 +0000
committerNick Mathewson <nickm@torproject.org>2017-08-24 16:09:41 -0400
commit77b92c2214325e2e26a06b1e61158a88a15bc227 (patch)
tree50e2b5e09b55099c844b180666c86960c93a104a /src/test/test.c
parent011d94fb11c0ccd8d009acba04304588f6d3694b (diff)
downloadtor-77b92c2214325e2e26a06b1e61158a88a15bc227.tar.gz
tor-77b92c2214325e2e26a06b1e61158a88a15bc227.zip
Ensure that `make check-spaces` is happy.
The `test-operator-cleanup` patch, and related coccinelle patches, don't do any checks for line length. This patch fixes the line length issues caused by the previous commits.
Diffstat (limited to 'src/test/test.c')
-rw-r--r--src/test/test.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/test/test.c b/src/test/test.c
index c5791d4858..702a13ab38 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -571,15 +571,21 @@ test_rend_fns(void *arg)
intro->intro_key = crypto_pk_dup_key(pk2);
smartlist_add(generated->intro_nodes, intro);
}
- tt_int_op(rend_encode_v2_descriptors(descs, generated, now, 0, REND_NO_AUTH, NULL, NULL),
- OP_GT, 0);
- tt_int_op(rend_compute_v2_desc_id(computed_desc_id, service_id_base32, NULL, now, 0),
- OP_EQ, 0);
+ int rv = rend_encode_v2_descriptors(descs, generated, now, 0,
+ REND_NO_AUTH, NULL, NULL);
+ tt_int_op(rv, OP_GT, 0);
+ rv = rend_compute_v2_desc_id(computed_desc_id, service_id_base32, NULL,
+ now, 0);
+ tt_int_op(rv, OP_EQ, 0);
tt_mem_op(((rend_encoded_v2_service_descriptor_t *)
smartlist_get(descs, 0))->desc_id, OP_EQ,
computed_desc_id, DIGEST_LEN);
- tt_int_op(rend_parse_v2_service_descriptor(&parsed, parsed_desc_id, &intro_points_encrypted, &intro_points_size, &encoded_size, &next_desc, ((rend_encoded_v2_service_descriptor_t *)smartlist_get(descs, 0))->desc_str, 1),
- OP_EQ, 0);
+ rv = rend_parse_v2_service_descriptor(&parsed, parsed_desc_id,
+ &intro_points_encrypted, &intro_points_size, &encoded_size,
+ &next_desc,
+ ((rend_encoded_v2_service_descriptor_t *)smartlist_get(descs, 0))
+ ->desc_str, 1);
+ tt_int_op(rv, OP_EQ, 0);
tt_assert(parsed);
tt_mem_op(((rend_encoded_v2_service_descriptor_t *)
smartlist_get(descs, 0))->desc_id,OP_EQ, parsed_desc_id, DIGEST_LEN);