commit bce32e0a356bc9d0b95a34301c6f3cc54622c4bb Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 2 15:40:47 2014 -0400
Fix more (void*)11 warnings in the tests --- src/test/test_circuitlist.c | 12 ++++++++--- src/test/test_containers.c | 48 ++++++++++++++++++++++++++++--------------- 2 files changed, 41 insertions(+), 19 deletions(-)
diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c index b19edd1..97c6b98 100644 --- a/src/test/test_circuitlist.c +++ b/src/test/test_circuitlist.c @@ -79,9 +79,9 @@ test_clist_maps(void *arg) memset(&cam, 0, sizeof(cam)); memset(&cdm, 0, sizeof(cdm));
- ch1->cmux = (void*)0x1001; - ch2->cmux = (void*)0x1002; - ch3->cmux = (void*)0x1003; + ch1->cmux = tor_malloc(1); + ch2->cmux = tor_malloc(1); + ch3->cmux = tor_malloc(1);
or_c1 = or_circuit_new(100, ch2); tt_assert(or_c1); @@ -156,6 +156,12 @@ test_clist_maps(void *arg) circuit_free(TO_CIRCUIT(or_c1)); if (or_c2) circuit_free(TO_CIRCUIT(or_c2)); + if (ch1) + tor_free(ch1->cmux); + if (ch2) + tor_free(ch2->cmux); + if (ch3) + tor_free(ch3->cmux); tor_free(ch1); tor_free(ch2); tor_free(ch3); diff --git a/src/test/test_containers.c b/src/test/test_containers.c index ca04f9b..a9f5e72 100644 --- a/src/test/test_containers.c +++ b/src/test/test_containers.c @@ -40,38 +40,54 @@ static void test_container_smartlist_basic(void) { smartlist_t *sl; + char *v0 = tor_strdup("v0"); + char *v1 = tor_strdup("v1"); + char *v2 = tor_strdup("v2"); + char *v3 = tor_strdup("v3"); + char *v4 = tor_strdup("v4"); + char *v22 = tor_strdup("v22"); + char *v99 = tor_strdup("v99"); + char *v555 = tor_strdup("v555");
/* XXXX test sort_digests, uniq_strings, uniq_digests */
/* Test smartlist add, del_keeporder, insert, get. */ sl = smartlist_new(); - smartlist_add(sl, (void*)1); - smartlist_add(sl, (void*)2); - smartlist_add(sl, (void*)3); - smartlist_add(sl, (void*)4); + smartlist_add(sl, v1); + smartlist_add(sl, v2); + smartlist_add(sl, v3); + smartlist_add(sl, v4); smartlist_del_keeporder(sl, 1); - smartlist_insert(sl, 1, (void*)22); - smartlist_insert(sl, 0, (void*)0); - smartlist_insert(sl, 5, (void*)555); - test_eq_ptr((void*)0, smartlist_get(sl,0)); - test_eq_ptr((void*)1, smartlist_get(sl,1)); - test_eq_ptr((void*)22, smartlist_get(sl,2)); - test_eq_ptr((void*)3, smartlist_get(sl,3)); - test_eq_ptr((void*)4, smartlist_get(sl,4)); - test_eq_ptr((void*)555, smartlist_get(sl,5)); + smartlist_insert(sl, 1, v22); + smartlist_insert(sl, 0, v0); + smartlist_insert(sl, 5, v555); + test_eq_ptr(v0, smartlist_get(sl,0)); + test_eq_ptr(v1, smartlist_get(sl,1)); + test_eq_ptr(v22, smartlist_get(sl,2)); + test_eq_ptr(v3, smartlist_get(sl,3)); + test_eq_ptr(v4, smartlist_get(sl,4)); + test_eq_ptr(v555, smartlist_get(sl,5)); /* Try deleting in the middle. */ smartlist_del(sl, 1); - test_eq_ptr((void*)555, smartlist_get(sl, 1)); + test_eq_ptr(v555, smartlist_get(sl, 1)); /* Try deleting at the end. */ smartlist_del(sl, 4); test_eq(4, smartlist_len(sl));
/* test isin. */ - test_assert(smartlist_contains(sl, (void*)3)); - test_assert(!smartlist_contains(sl, (void*)99)); + test_assert(smartlist_contains(sl, v3)); + test_assert(!smartlist_contains(sl, v99));
done: smartlist_free(sl); + tor_free(v0); + tor_free(v1); + tor_free(v2); + tor_free(v3); + tor_free(v4); + tor_free(v22); + tor_free(v99); + tor_free(v555); }
/** Run unit tests for smartlist-of-strings functionality. */