system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-03 08:29:25 +00:00
Code Issues Projects Releases Wiki Activity

coccinelle: convert hashmap_size() == 0 or friends

Browse Source 
Addresses https://github.com/systemd/systemd/pull/30567#issuecomment-1866631816.
This commit is contained in:
Yu Watanabe 2023-12-25 00:44:56 +09:00
parent 54cbad304c
commit 6ae5d4b52f
2 changed files with 92 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
coccinelle/isempty.cocci
View File

@ -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)
)

2
src/network/test-networkd-conf.c
View File

@ -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 \