]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: use string_hash_ops_free
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 11 Apr 2025 02:56:57 +0000 (11:56 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 18 Apr 2025 00:16:44 +0000 (09:16 +0900)
src/test/test-nulstr-util.c
src/test/test-serialize.c

index 9b13d3c339ab94cd3dc55f411612300913075539..5110435778ac5ea850681fb82c75ce114aa48961 100644 (file)
@@ -110,7 +110,7 @@ TEST(strv_make_nulstr) {
 }
 
 TEST(set_make_nulstr) {
-        _cleanup_set_free_free_ Set *set = NULL;
+        _cleanup_set_free_ Set *set = NULL;
         size_t len = 0;
         int r;
 
@@ -130,7 +130,7 @@ TEST(set_make_nulstr) {
                 static const char expect[] = { 0x00, 0x00 };
                 _cleanup_free_ char *nulstr = NULL;
 
-                set = set_new(NULL);
+                set = set_new(&string_hash_ops_free);
                 assert_se(set);
 
                 r = set_make_nulstr(set, &nulstr, &len);
index 755aa9d869a5a00b989250eff8281fab3496a123..ccbd2f89dde69ef39457e310a9136c9a1627ca3e 100644 (file)
@@ -227,14 +227,14 @@ TEST(serialize_item_base64mem) {
 TEST(serialize_string_set) {
         _cleanup_(unlink_tempfilep) char fn[] = "/tmp/test-serialize.XXXXXX";
         _cleanup_fclose_ FILE *f = NULL;
-        _cleanup_set_free_free_ Set *s = NULL;
+        _cleanup_set_free_ Set *s = NULL;
         _cleanup_free_ char *line1 = NULL, *line2 = NULL;
         char *p, *q;
 
         assert_se(fmkostemp_safe(fn, "r+", &f) == 0);
         log_info("/* %s (%s) */", __func__, fn);
 
-        assert_se(set_ensure_allocated(&s, &string_hash_ops) >= 0);
+        assert_se(set_ensure_allocated(&s, &string_hash_ops_free) >= 0);
 
         assert_se(serialize_string_set(f, "a", s) == 0);