chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nss-myhostname: ensure that glibc's assert is used
[elogind.git]
/
src
/
shared
/
cgroup-label.c
diff --git
a/src/shared/cgroup-label.c
b/src/shared/cgroup-label.c
index 995e4c57cd4fa3f745b0dafa6e6d155c039e6222..5b5163c250e1b8e60fbba2e9c55715633577a2c7 100644
(file)
--- a/
src/shared/cgroup-label.c
+++ b/
src/shared/cgroup-label.c
@@
-36,14
+36,11
@@
#include "util.h"
#include "mkdir.h"
#include "util.h"
#include "mkdir.h"
-int cg_create(const char *controller, const char *path) {
+int cg_create(const char *controller, const char *path
, const char *suffix
) {
_cleanup_free_ char *fs = NULL;
int r;
_cleanup_free_ char *fs = NULL;
int r;
- assert(controller);
- assert(path);
-
- r = cg_get_path_and_check(controller, path, NULL, &fs);
+ r = cg_get_path_and_check(controller, path, suffix, &fs);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-65,11
+62,9
@@
int cg_create(const char *controller, const char *path) {
int cg_create_and_attach(const char *controller, const char *path, pid_t pid) {
int r, q;
int cg_create_and_attach(const char *controller, const char *path, pid_t pid) {
int r, q;
- assert(controller);
- assert(path);
assert(pid >= 0);
assert(pid >= 0);
- r = cg_create(controller, path);
+ r = cg_create(controller, path
, NULL
);
if (r < 0)
return r;
if (r < 0)
return r;