Merge pull request #30621 from yuwata/coccinelle

coccinelle: convert hashmap_size() == 0 and friends
systemd · Dec 24, 2023 · 11c3616 · 11c3616
2 parents ab84005 + 6ae5d4b
commit 11c3616
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 4 deletions.
diff --git a/coccinelle/isempty.cocci b/coccinelle/isempty.cocci
@@ -41,3 +41,94 @@ expression s;
 - strlen_ptr@p(s) != 0
 + !isempty(s)
 )
+@@
+/* Disable this transformation for the hashmap.h, set.h, test-hashmap.c, test-hashmap-plain.c */
+position p : script:python() {
+                p[0].file != "src/basic/hashmap.h" and
+                p[0].file != "src/basic/set.h" and
+                p[0].file != "src/test/test-hashmap.c" and
+                p[0].file != "src/test/test-hashmap-plain.c"
+        };
+expression s;
+@@
+(
+- hashmap_size@p(s) == 0
++ hashmap_isempty(s)
+|
+- hashmap_size@p(s) <= 0
++ hashmap_isempty(s)
+|
+- hashmap_size@p(s) > 0
++ !hashmap_isempty(s)
+|
+- hashmap_size@p(s) != 0
++ !hashmap_isempty(s)
+|
+- ordered_hashmap_size@p(s) == 0
++ ordered_hashmap_isempty(s)
+|
+- ordered_hashmap_size@p(s) <= 0
++ ordered_hashmap_isempty(s)
+|
+- ordered_hashmap_size@p(s) > 0
++ !ordered_hashmap_isempty(s)
+|
+- ordered_hashmap_size@p(s) != 0
++ !ordered_hashmap_isempty(s)
+|
+- set_size@p(s) == 0
++ set_isempty(s)
+|
+- set_size@p(s) <= 0
++ set_isempty(s)
+|
+- set_size@p(s) > 0
++ !set_isempty(s)
+|
+- set_size@p(s) != 0
++ !set_isempty(s)
+|
+- ordered_set_size@p(s) == 0
++ ordered_set_isempty(s)
+|
+- ordered_set_size@p(s) <= 0
++ ordered_set_isempty(s)
+|
+- ordered_set_size@p(s) > 0
++ !ordered_set_isempty(s)
+|
+- ordered_set_size@p(s) != 0
++ !ordered_set_isempty(s)
+)
+@@
+expression s;
+@@
+(
+- fdset_size(s) == 0
++ fdset_isempty(s)
+|
+- fdset_size(s) <= 0
++ fdset_isempty(s)
+|
+- fdset_size(s) > 0
++ !fdset_isempty(s)
+|
+- fdset_size(s) != 0
++ !fdset_isempty(s)
+)
+@@
+expression s;
+@@
+(
+- prioq_size(s) == 0
++ prioq_isempty(s)
+|
+- prioq_size(s) <= 0
++ prioq_isempty(s)
+|
+- prioq_size(s) > 0
++ !prioq_isempty(s)
+|
+- prioq_size(s) != 0
++ !prioq_isempty(s)
+)
diff --git a/src/libsystemd/sd-device/device-enumerator.c b/src/libsystemd/sd-device/device-enumerator.c
@@ -662,10 +662,8 @@ static int enumerator_add_parent_devices(
                         continue;
 
                 r = device_enumerator_add_device(enumerator, device);
-                if (r < 0)
+                if (r <= 0) /* r == 0 means the device already exists, then no need to go further up. */
                         return r;
-                if (r == 0) /* Exists already? Then no need to go further up. */
-                        return 0;
         }
 }
 

diff --git a/src/network/test-networkd-conf.c b/src/network/test-networkd-conf.c
@@ -80,7 +80,7 @@ static void test_config_parse_ether_addrs_one(const char *rvalue, const struct e
                 assert_se(q = set_remove(s, &list[m]));
         }
 
-        assert_se(set_size(s) == 0);
+        assert_se(set_isempty(s));
 }
 
 #define STR_OK                                                          \