chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cgroup: rework cg_all_unified()
[elogind.git]
/
src
/
basic
/
unit-name.c
diff --git
a/src/basic/unit-name.c
b/src/basic/unit-name.c
index 6e6bd3bdb8aaee0642e51e8d755b0ad1cbdb0967..21fec7316eb5be5c1c3975fe32b6bc3e2d186ec1 100644
(file)
--- a/
src/basic/unit-name.c
+++ b/
src/basic/unit-name.c
@@
-275,7
+275,7
@@
int unit_name_build(const char *prefix, const char *instance, const char *suffix
if (!instance)
s = strappend(prefix, suffix);
else
if (!instance)
s = strappend(prefix, suffix);
else
- s = strjoin(prefix, "@", instance, suffix
, NULL
);
+ s = strjoin(prefix, "@", instance, suffix);
if (!s)
return -ENOMEM;
if (!s)
return -ENOMEM;
@@
-557,7
+557,7
@@
int unit_name_from_path_instance(const char *prefix, const char *path, const cha
if (r < 0)
return r;
if (r < 0)
return r;
- s = strjoin(prefix, "@", p, suffix
, NULL
);
+ s = strjoin(prefix, "@", p, suffix);
if (!s)
return -ENOMEM;
if (!s)
return -ENOMEM;
@@
-761,7
+761,7
@@
int slice_build_parent_slice(const char *slice, char **ret) {
else {
r = free_and_strdup(&s, "-.slice");
if (r < 0) {
else {
r = free_and_strdup(&s, "-.slice");
if (r < 0) {
- free(s);
+
free(s);
return r;
}
}
return r;
}
}