chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: rename join() to strjoin()
[elogind.git]
/
src
/
shared
/
cgroup-util.c
diff --git
a/src/shared/cgroup-util.c
b/src/shared/cgroup-util.c
index 6740d3b8856c2c1f0d616e1a8e0e124a3f2bac3b..b0d378de5ade1e577a0c7f86cd7b294b3e0ec709 100644
(file)
--- a/
src/shared/cgroup-util.c
+++ b/
src/shared/cgroup-util.c
@@
-522,16
+522,16
@@
static int join_path(const char *controller, const char *path, const char *suffi
if (controller) {
if (path && suffix)
if (controller) {
if (path && suffix)
- t = join("/sys/fs/cgroup/", controller, "/", path, "/", suffix, NULL);
+ t =
str
join("/sys/fs/cgroup/", controller, "/", path, "/", suffix, NULL);
else if (path)
else if (path)
- t = join("/sys/fs/cgroup/", controller, "/", path, NULL);
+ t =
str
join("/sys/fs/cgroup/", controller, "/", path, NULL);
else if (suffix)
else if (suffix)
- t = join("/sys/fs/cgroup/", controller, "/", suffix, NULL);
+ t =
str
join("/sys/fs/cgroup/", controller, "/", suffix, NULL);
else
else
- t = join("/sys/fs/cgroup/", controller, NULL);
+ t =
str
join("/sys/fs/cgroup/", controller, NULL);
} else {
if (path && suffix)
} else {
if (path && suffix)
- t = join(path, "/", suffix, NULL);
+ t =
str
join(path, "/", suffix, NULL);
else if (path)
t = strdup(path);
}
else if (path)
t = strdup(path);
}