diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-04-09 14:04:09 -0400 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-06-16 10:12:57 +0200 |
| commit | c3493a44f55e1c807b2b772403c02880d4cb1b16 (patch) | |
| tree | fd871bd45bafa81a8ea38f0ef97e4272928e5de7 /src | |
| parent | 794becf1e6b0c357ad0d560b9c53e172cdb86e0b (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')
| -rw-r--r-- | src/login/logind-session.c | 2 | ||||
| -rw-r--r-- | src/shared/bus-util.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/login/logind-session.c b/src/login/logind-session.c index ff2c95c55..e615ccd31 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -520,7 +520,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, diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index 94872a31c..c8092e0e5 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -2053,8 +2053,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)) { |