shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

tree-wide: remove useless NULLs from strjoina

Browse Source 
The coccinelle patch didn't work in some places, I have no idea why.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2016-04-09 14:04:09 -04:00
parent 78e334b50f
commit 81d621034b
9 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
coccinelle/strjoina.cocci Normal file
View File

@ -0,0 +1,6 @@
@@
expression n, m;
expression list s;
@@
- n = strjoina(m, s, NULL);
+ n = strjoina(m, s);

13
src/core/unit.c
View File

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

2
src/coredump/coredump.c
View File

@ -1095,7 +1095,7 @@ static int process_kernel(int argc, char* argv[]) {
IOVEC_SET_STRING(iovec[n_iovec++], core_environ);
}
core_timestamp = strjoina("COREDUMP_TIMESTAMP=", context[CONTEXT_TIMESTAMP], "000000", NULL);
core_timestamp = strjoina("COREDUMP_TIMESTAMP=", context[CONTEXT_TIMESTAMP], "000000");
IOVEC_SET_STRING(iovec[n_iovec++], core_timestamp);
IOVEC_SET_STRING(iovec[n_iovec++], "MESSAGE_ID=fc2e22bc6ee647b6b90729ab34a250b1");

2
src/login/logind-session.c
View File

@ -513,7 +513,7 @@ static int session_start_scope(Session *s) {
if (!scope)
return log_oom();
description = strjoina("Session ", s->id, " of user ", s->user->name, NULL);
description = strjoina("Session ", s->id, " of user ", s->user->name);
r = manager_start_scope(
s->manager,

2
src/machine/machine-dbus.c
View File

@ -730,7 +730,7 @@ int bus_machine_method_open_shell(sd_bus_message *message, void *userdata, sd_bu
return r;
/* Name and mode */
unit = strjoina("container-shell@", p, ".service", NULL);
unit = strjoina("container-shell@", p, ".service");
r = sd_bus_message_append(tm, "ss", unit, "fail");
if (r < 0)
return r;

2
src/resolve/resolved-dns-dnssec.c
View File

@ -1734,7 +1734,7 @@ static int dnssec_nsec_covers_wildcard(DnsResourceRecord *rr, const char *name)
if (r <= 0)
return r;
wc = strjoina("*.", common_suffix, NULL);
wc = strjoina("*.", common_suffix);
return dns_name_between(dns_resource_key_name(rr->key), wc, rr->nsec.next_domain_name);
}

4
src/shared/bus-util.c
View File

@ -2050,8 +2050,8 @@ static void log_job_error_with_service_result(const char* service, const char *r
_cleanup_free_ char *t;
t = strv_join((char**) extra_args, " ");
systemctl = strjoina("systemctl ", t ?: "<args>", NULL);
journalctl = strjoina("journalctl ", t ?: "<args>", NULL);
systemctl = strjoina("systemctl ", t ? : "<args>");
journalctl = strjoina("journalctl ", t ? : "<args>");
}
if (!isempty(result)) {

2
src/shared/path-lookup.c
View File

@ -249,7 +249,7 @@ static int acquire_generator_dirs(
if (!e)
return -ENXIO;
prefix = strjoina(e, "/systemd/", NULL);
prefix = strjoina(e, "/systemd/");
break;
}

2
src/systemctl/systemctl.c
View File

@ -3254,7 +3254,7 @@ static int kill_unit(int argc, char *argv[], void *userdata) {
/* --fail was specified */
if (streq(arg_job_mode, "fail"))
kill_who = strjoina(arg_kill_who, "-fail", NULL);
kill_who = strjoina(arg_kill_who, "-fail");
r = expand_names(bus, strv_skip(argv, 1), NULL, &names);
if (r < 0)