diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-06-12 13:03:19 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-06-12 23:55:26 +0900 |
| commit | dcf557f7b04a3c5202ddbafca06311a12442fd4c (patch) | |
| tree | 8f5b42f34cca3690d140ca68052f17d19298d420 /src/test | |
| parent | 337405d4394e4812335920e58603427799d58217 (diff) | |
| download | systemd-dcf557f7b04a3c5202ddbafca06311a12442fd4c.tar.gz | |
libudev: hide definition of struct udev_list from other libudev components
In the later commit, udev_list will be just a wrapper of hashmap or LIST.
So, allocating udev_list does not increase much cost.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test-libudev.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/test/test-libudev.c b/src/test/test-libudev.c index 7878512465..dcb5bcc254 100644 --- a/src/test/test-libudev.c +++ b/src/test/test-libudev.c @@ -433,19 +433,20 @@ static void test_util_resolve_subsys_kernel(void) { } static void test_list(void) { - struct udev_list list = {}; + _cleanup_(udev_list_freep) struct udev_list *list = NULL; struct udev_list_entry *e; /* empty list */ - udev_list_init(&list, false); - assert_se(!udev_list_get_entry(&list)); + assert_se(list = udev_list_new(false)); + assert_se(!udev_list_get_entry(list)); + list = udev_list_free(list); /* unique == false */ - udev_list_init(&list, false); - assert_se(udev_list_entry_add(&list, "aaa", "hoge")); - assert_se(udev_list_entry_add(&list, "aaa", "hogehoge")); - assert_se(udev_list_entry_add(&list, "bbb", "foo")); - e = udev_list_get_entry(&list); + assert_se(list = udev_list_new(false)); + assert_se(udev_list_entry_add(list, "aaa", "hoge")); + assert_se(udev_list_entry_add(list, "aaa", "hogehoge")); + assert_se(udev_list_entry_add(list, "bbb", "foo")); + e = udev_list_get_entry(list); assert_se(e); assert_se(streq_ptr(udev_list_entry_get_name(e), "aaa")); assert_se(streq_ptr(udev_list_entry_get_value(e), "hoge")); @@ -462,14 +463,14 @@ static void test_list(void) { assert_se(!udev_list_entry_get_by_name(e, "aaa")); assert_se(!udev_list_entry_get_by_name(e, "bbb")); assert_se(!udev_list_entry_get_by_name(e, "ccc")); - udev_list_cleanup(&list); + list = udev_list_free(list); /* unique == true */ - udev_list_init(&list, true); - assert_se(udev_list_entry_add(&list, "aaa", "hoge")); - assert_se(udev_list_entry_add(&list, "aaa", "hogehoge")); - assert_se(udev_list_entry_add(&list, "bbb", "foo")); - e = udev_list_get_entry(&list); + assert_se(list = udev_list_new(true)); + assert_se(udev_list_entry_add(list, "aaa", "hoge")); + assert_se(udev_list_entry_add(list, "aaa", "hogehoge")); + assert_se(udev_list_entry_add(list, "bbb", "foo")); + e = udev_list_get_entry(list); assert_se(e); assert_se(streq_ptr(udev_list_entry_get_name(e), "aaa")); assert_se(streq_ptr(udev_list_entry_get_value(e), "hogehoge")); @@ -487,7 +488,6 @@ static void test_list(void) { assert_se(streq_ptr(udev_list_entry_get_name(e), "aaa")); assert_se(streq_ptr(udev_list_entry_get_value(e), "hogehoge")); assert_se(!udev_list_entry_get_by_name(e, "ccc")); - udev_list_cleanup(&list); } static int parse_args(int argc, char *argv[], const char **syspath, const char **subsystem) { |