mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-23 14:40:51 +01:00
Code Issues Projects Releases Wiki Activity

Add a smartlist_remove_keeporder() function, with tests.

Browse source
This commit is contained in:
Nick Mathewson 2016-11-23 14:07:53 -05:00
parent bf64564e37
commit 21c47c4410
3 changed files with 60 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/common/container.c
View file

@ -132,6 +132,24 @@ smartlist_remove(smartlist_t *sl, const void *element)
}
}
/** As <b>smartlist_remove</b>, but do not change the order of
* any elements not removed */
void
smartlist_remove_keeporder(smartlist_t *sl, const void *element)
{
int i, j, num_used_orig = sl->num_used;
if (element == NULL)
return;
for (i=j=0; j < num_used_orig; ++j) {
if (sl->list[j] == element) {
--sl->num_used;
} else {
sl->list[i++] = sl->list[j];
}
}
}
/** If <b>sl</b> is nonempty, remove and return the final element. Otherwise,
* return NULL. */
void *

1
src/common/container.h
View file

@ -33,6 +33,7 @@ void smartlist_clear(smartlist_t *sl);
void smartlist_add(smartlist_t *sl, void *element);
void smartlist_add_all(smartlist_t *sl, const smartlist_t *s2);
void smartlist_remove(smartlist_t *sl, const void *element);
void smartlist_remove_keeporder(smartlist_t *sl, const void *element);
void *smartlist_pop_last(smartlist_t *sl);
void smartlist_reverse(smartlist_t *sl);
void smartlist_string_remove(smartlist_t *sl, const char *element);

41
src/test/test_containers.c
View file

@ -882,6 +882,46 @@ test_container_strmap(void *arg)
tor_free(v105);
}
static void
test_container_smartlist_remove(void *arg)
{
(void) arg;
int array[5];
smartlist_t *sl = smartlist_new();
int i,j;
for (j=0; j < 2; ++j)
for (i=0; i < 5; ++i)
smartlist_add(sl, &array[i]);
smartlist_remove(sl, &array[0]);
smartlist_remove(sl, &array[3]);
smartlist_remove(sl, &array[4]);
tt_assert(! smartlist_contains(sl, &array[0]));
tt_assert(smartlist_contains(sl, &array[1]));
tt_assert(smartlist_contains(sl, &array[2]));
tt_assert(! smartlist_contains(sl, &array[3]));
tt_assert(! smartlist_contains(sl, &array[4]));
tt_int_op(smartlist_len(sl), OP_EQ, 4);
smartlist_clear(sl);
for (j=0; j < 2; ++j)
for (i=0; i < 5; ++i)
smartlist_add(sl, &array[i]);
smartlist_remove_keeporder(sl, &array[0]);
smartlist_remove_keeporder(sl, &array[3]);
smartlist_remove_keeporder(sl, &array[4]);
tt_int_op(smartlist_len(sl), OP_EQ, 4);
tt_ptr_op(smartlist_get(sl, 0), OP_EQ, &array[1]);
tt_ptr_op(smartlist_get(sl, 1), OP_EQ, &array[2]);
tt_ptr_op(smartlist_get(sl, 2), OP_EQ, &array[1]);
tt_ptr_op(smartlist_get(sl, 3), OP_EQ, &array[2]);
done:
smartlist_free(sl);
}
/** Run unit tests for getting the median of a list. */
static void
test_container_order_functions(void *arg)
@ -1239,6 +1279,7 @@ struct testcase_t container_tests[] = {
CONTAINER_LEGACY(smartlist_digests),
CONTAINER_LEGACY(smartlist_join),
CONTAINER_LEGACY(smartlist_pos),
CONTAINER(smartlist_remove, 0),
CONTAINER(smartlist_ints_eq, 0),
CONTAINER_LEGACY(bitarray),
CONTAINER_LEGACY(digestset),