diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-03-13 15:57:55 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-03-14 00:39:05 +0900 |
| commit | cf45350745ef02b80378761dcccf4e9744ef839a (patch) | |
| tree | dc1376926a36e85e31932922d66d168d3aed7edb /src/test/test-ordered-set.c | |
| parent | 95ba433a5f34baf92921fb58051bc8241f908c0e (diff) | |
| download | systemd-cf45350745ef02b80378761dcccf4e9744ef839a.tar.gz | |
ordered-set: make ordered_set_put_strdup() allocate OrderedSet object
For consistency with set_put_strdup().
Diffstat (limited to 'src/test/test-ordered-set.c')
| -rw-r--r-- | src/test/test-ordered-set.c | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/src/test/test-ordered-set.c b/src/test/test-ordered-set.c index 0fbdd9706f..8d3c5b0d8c 100644 --- a/src/test/test-ordered-set.c +++ b/src/test/test-ordered-set.c @@ -95,31 +95,20 @@ static void test_set_put(void) { } static void test_set_put_string_set(void) { - _cleanup_ordered_set_free_free_ OrderedSet *m = NULL; - _cleanup_ordered_set_free_ OrderedSet *q = NULL; + _cleanup_ordered_set_free_ OrderedSet *m = NULL, *q = NULL; _cleanup_free_ char **final = NULL; /* "just free" because the strings are in the set */ - void *t; log_info("/* %s */", __func__); - m = ordered_set_new(&string_hash_ops); - assert_se(m); - - q = ordered_set_new(&string_hash_ops); - assert_se(q); - - assert_se(t = strdup("1")); - assert_se(ordered_set_put(m, t) == 1); - assert_se(t = strdup("22")); - assert_se(ordered_set_put(m, t) == 1); - assert_se(t = strdup("333")); - assert_se(ordered_set_put(m, t) == 1); + assert_se(ordered_set_put_strdup(&m, "1") == 1); + assert_se(ordered_set_put_strdup(&m, "22") == 1); + assert_se(ordered_set_put_strdup(&m, "333") == 1); - assert_se(ordered_set_put(q, (void*) "11") == 1); - assert_se(ordered_set_put(q, (void*) "22") == 1); - assert_se(ordered_set_put(q, (void*) "33") == 1); + assert_se(ordered_set_put_strdup(&q, "11") == 1); + assert_se(ordered_set_put_strdup(&q, "22") == 1); + assert_se(ordered_set_put_strdup(&q, "33") == 1); - assert_se(ordered_set_put_string_set(m, q) == 2); + assert_se(ordered_set_put_string_set(&m, q) == 2); assert_se(final = ordered_set_get_strv(m)); assert_se(strv_equal(final, STRV_MAKE("1", "22", "333", "11", "33"))); |