chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: reorder bonding and bridging
[elogind.git]
/
src
/
shared
/
cgroup-util.c
diff --git
a/src/shared/cgroup-util.c
b/src/shared/cgroup-util.c
index 06eb453d1a131be358ebdadbbad1477781deb014..139888c4a11152bafded2f3c032db8f6e706a39c 100644
(file)
--- a/
src/shared/cgroup-util.c
+++ b/
src/shared/cgroup-util.c
@@
-472,9
+472,7
@@
static int join_path(const char *controller, const char *path, const char *suffi
if (!t)
return -ENOMEM;
if (!t)
return -ENOMEM;
- path_kill_slashes(t);
-
- *fs = t;
+ *fs = path_kill_slashes(t);
return 0;
}
return 0;
}
@@
-509,7
+507,7
@@
static int check_hierarchy(const char *p) {
assert(p);
/* Check if this controller actually really exists */
assert(p);
/* Check if this controller actually really exists */
- cc = alloca(s
izeof("/sys/fs/cgroup/") + strlen(p)
);
+ cc = alloca(s
trlen("/sys/fs/cgroup/") + strlen(p) + 1
);
strcpy(stpcpy(cc, "/sys/fs/cgroup/"), p);
if (access(cc, F_OK) < 0)
return -errno;
strcpy(stpcpy(cc, "/sys/fs/cgroup/"), p);
if (access(cc, F_OK) < 0)
return -errno;
@@
-957,8
+955,7
@@
int cg_split_spec(const char *spec, char **controller, char **path) {
if (!t)
return -ENOMEM;
if (!t)
return -ENOMEM;
- path_kill_slashes(t);
- *path = t;
+ *path = path_kill_slashes(t);
}
if (controller)
}
if (controller)
@@
-1048,8
+1045,7
@@
int cg_mangle_path(const char *path, char **result) {
if (!t)
return -ENOMEM;
if (!t)
return -ENOMEM;
- path_kill_slashes(t);
- *result = t;
+ *result = path_kill_slashes(t);
return 0;
}
return 0;
}