summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-04-09 14:04:09 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-04-13 08:56:44 -0400
commit81d621034badfd75edb5e1fc88334af9a87a18e3 (patch)
tree5853402ea70da91f28c61c3bb78acca8774b4ac3 /src/core
parent78e334b50f12a3ef386fb5de03d0549fa853c692 (diff)
tree-wide: remove useless NULLs from strjoina
The coccinelle patch didn't work in some places, I have no idea why.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/unit.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/core/unit.c b/src/core/unit.c
index 49c990c2d7..c60ae2be9d 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2518,12 +2518,11 @@ int unit_install_bus_match(Unit *u, sd_bus *bus, const char *name) {
return -EBUSY;
match = strjoina("type='signal',"
- "sender='org.freedesktop.DBus',"
- "path='/org/freedesktop/DBus',"
- "interface='org.freedesktop.DBus',"
- "member='NameOwnerChanged',"
- "arg0='", name, "'",
- NULL);
+ "sender='org.freedesktop.DBus',"
+ "path='/org/freedesktop/DBus',"
+ "interface='org.freedesktop.DBus',"
+ "member='NameOwnerChanged',"
+ "arg0='", name, "'");
return sd_bus_add_match(bus, &u->match_bus_slot, match, signal_name_owner_changed, u);
}
@@ -3437,7 +3436,7 @@ int unit_write_drop_in_private(Unit *u, UnitSetPropertiesMode mode, const char *
if (!IN_SET(mode, UNIT_PERSISTENT, UNIT_RUNTIME))
return 0;
- ndata = strjoina("[", UNIT_VTABLE(u)->private_section, "]\n", data, NULL);
+ ndata = strjoina("[", UNIT_VTABLE(u)->private_section, "]\n", data);
return unit_write_drop_in(u, mode, name, ndata);
}