summaryrefslogtreecommitdiff
path: root/src/basic/cgroup-util.c
diff options
context:
space:
mode:
authorSven Eden <yamakuzure@gmx.net>2017-12-07 18:59:58 +0100
committerSven Eden <yamakuzure@gmx.net>2017-12-07 18:59:58 +0100
commit326e11bd6182202b830c66742c1ddd6d419e8f5f (patch)
treec0181fea9d655a5821676a8fd029cc6989d6c133 /src/basic/cgroup-util.c
parent3344b839df8fe2dd2b4a4f470225e4c407cf2faa (diff)
Apply updates from upstream
Diffstat (limited to 'src/basic/cgroup-util.c')
-rw-r--r--src/basic/cgroup-util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 630ae23a0..8136e62b4 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -153,7 +153,7 @@ bool cg_ns_supported(void) {
return enabled;
}
-#endif //0
+#endif // 0
int cg_enumerate_subgroups(const char *controller, const char *path, DIR **_d) {
_cleanup_free_ char *fs = NULL;
@@ -1037,7 +1037,7 @@ int cg_get_xattr(const char *controller, const char *path, const char *name, voi
int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
_cleanup_fclose_ FILE *f = NULL;
char line[LINE_MAX];
- const char *fs, *controller_str = NULL;
+ const char *fs, *controller_str;
size_t cs = 0;
int unified;