picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core: use empty_to_null() where we can

This commit is contained in:
Lennart Poettering 2017-12-07 12:13:00 +01:00
parent 3708254f36
commit a8ea93a5e2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
coccinelle/empty-to-null.cocci Normal file
View File

@ -0,0 +1,5 @@
@@
expression s;
@@
- isempty(s) ? NULL : s
+ empty_to_null(s)

4
src/core/unit.c
View File

@ -3015,8 +3015,8 @@ static int signal_name_owner_changed(sd_bus_message *message, void *userdata, sd
return 0;
}
old_owner = isempty(old_owner) ? NULL : old_owner;
new_owner = isempty(new_owner) ? NULL : new_owner;
old_owner = empty_to_null(old_owner);
new_owner = empty_to_null(new_owner);
if (UNIT_VTABLE(u)->bus_name_owner_change)
UNIT_VTABLE(u)->bus_name_owner_change(u, name, old_owner, new_owner);