chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tree-wide: drop NULL sentinel from strjoin
[elogind.git]
/
src
/
libelogind
/
sd-bus
/
sd-bus.c
diff --git
a/src/libelogind/sd-bus/sd-bus.c
b/src/libelogind/sd-bus/sd-bus.c
index 3c6b210bd2a7fc279e17bb7d2e7622765bb211a9..4173ecde66904808fa1ae5a371cbabf94ba76887 100644
(file)
--- a/
src/libelogind/sd-bus/sd-bus.c
+++ b/
src/libelogind/sd-bus/sd-bus.c
@@
-1355,7
+1355,7
@@
int bus_set_address_system_remote(sd_bus *b, const char *host) {
return -ENOMEM;
}
return -ENOMEM;
}
- b->address = strjoin("unixexec:path=ssh,argv1=-xT,argv2=", e, ",argv3=systemd-stdio-bridge", c
, NULL
);
+ b->address = strjoin("unixexec:path=ssh,argv1=-xT,argv2=", e, ",argv3=systemd-stdio-bridge", c);
if (!b->address)
return -ENOMEM;
if (!b->address)
return -ENOMEM;
@@
-1403,7
+1403,7
@@
int bus_set_address_system_machine(sd_bus *b, const char *machine) {
if (!e)
return -ENOMEM;
if (!e)
return -ENOMEM;
- b->address = strjoin("x-machine-kernel:machine=", e, ";x-machine-unix:machine=", e
, NULL
);
+ b->address = strjoin("x-machine-kernel:machine=", e, ";x-machine-unix:machine=", e);
if (!b->address)
return -ENOMEM;
if (!b->address)
return -ENOMEM;
@@
-3511,7
+3511,7
@@
_public_ int sd_bus_path_encode(const char *prefix, const char *external_id, cha
if (!e)
return -ENOMEM;
if (!e)
return -ENOMEM;
- ret = strjoin(prefix, "/", e
, NULL
);
+ ret = strjoin(prefix, "/", e);
if (!ret)
return -ENOMEM;
if (!ret)
return -ENOMEM;