From a8ea93a5e2a5d6cc2d448a42c265bac2408e0b21 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 7 Dec 2017 12:13:00 +0100 Subject: [PATCH] core: use empty_to_null() where we can --- coccinelle/empty-to-null.cocci | 5 +++++ src/core/unit.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 coccinelle/empty-to-null.cocci diff --git a/coccinelle/empty-to-null.cocci b/coccinelle/empty-to-null.cocci new file mode 100644 index 00000000000..fbc75b9c343 --- /dev/null +++ b/coccinelle/empty-to-null.cocci @@ -0,0 +1,5 @@ +@@ +expression s; +@@ +- isempty(s) ? NULL : s ++ empty_to_null(s) diff --git a/src/core/unit.c b/src/core/unit.c index ed0cf026785..7af8425707e 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -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); -- 2.47.3