chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shared: Drop 'name=' prefix from SYSTEMD_CGROUP_CONTROLLER define.
[elogind.git]
/
src
/
shared
/
cgroup-util.c
diff --git
a/src/shared/cgroup-util.c
b/src/shared/cgroup-util.c
index a48b312018c26d420a1c1a10a0509fa1fd84cc8b..b286243c3629cb165ed3c8c353f50b5387e80f8e 100644
(file)
--- a/
src/shared/cgroup-util.c
+++ b/
src/shared/cgroup-util.c
@@
-440,9
+440,7
@@
static const char *normalize_controller(const char *controller) {
assert(controller);
assert(controller);
- if (streq(controller, SYSTEMD_CGROUP_CONTROLLER))
- return "systemd";
- else if (startswith(controller, "name="))
+ if (startswith(controller, "name="))
return controller + 5;
else
return controller;
return controller + 5;
else
return controller;
@@
-482,7
+480,7
@@
int cg_get_path(const char *controller, const char *path, const char *suffix, ch
assert(fs);
assert(fs);
- if (controller && !cg_controller_is_valid(controller
, true
))
+ if (controller && !cg_controller_is_valid(controller))
return -EINVAL;
if (_unlikely_(!good)) {
return -EINVAL;
if (_unlikely_(!good)) {
@@
-525,7
+523,7
@@
int cg_get_path_and_check(const char *controller, const char *path, const char *
assert(fs);
assert(fs);
- if (!cg_controller_is_valid(controller
, true
))
+ if (!cg_controller_is_valid(controller))
return -EINVAL;
/* Normalize the controller syntax */
return -EINVAL;
/* Normalize the controller syntax */
@@
-741,7
+739,7
@@
int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
assert(pid >= 0);
if (controller) {
assert(pid >= 0);
if (controller) {
- if (!cg_controller_is_valid(controller
, true
))
+ if (!cg_controller_is_valid(controller))
return -EINVAL;
controller = normalize_controller(controller);
return -EINVAL;
controller = normalize_controller(controller);
@@
-970,7
+968,7
@@
int cg_split_spec(const char *spec, char **controller, char **path) {
e = strchr(spec, ':');
if (!e) {
e = strchr(spec, ':');
if (!e) {
- if (!cg_controller_is_valid(spec
, true
))
+ if (!cg_controller_is_valid(spec))
return -EINVAL;
if (controller) {
return -EINVAL;
if (controller) {
@@
-993,7
+991,7
@@
int cg_split_spec(const char *spec, char **controller, char **path) {
t = strdup(normalize_controller(v));
if (!t)
return -ENOMEM;
t = strdup(normalize_controller(v));
if (!t)
return -ENOMEM;
- if (!cg_controller_is_valid(t
, true
)) {
+ if (!cg_controller_is_valid(t)) {
free(t);
return -EINVAL;
}
free(t);
return -EINVAL;
}
@@
-1609,17
+1607,15
@@
char *cg_unescape(const char *p) {
DIGITS LETTERS \
"_"
DIGITS LETTERS \
"_"
-bool cg_controller_is_valid(const char *p
, bool allow_named
) {
+bool cg_controller_is_valid(const char *p) {
const char *t, *s;
if (!p)
return false;
const char *t, *s;
if (!p)
return false;
- if (allow_named) {
- s = startswith(p, "name=");
- if (s)
- p = s;
- }
+ s = startswith(p, "name=");
+ if (s)
+ p = s;
if (*p == 0 || *p == '_')
return false;
if (*p == 0 || *p == '_')
return false;