chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix order and document user unit dirs
[elogind.git]
/
src
/
shared
/
cgroup-util.c
diff --git
a/src/shared/cgroup-util.c
b/src/shared/cgroup-util.c
index 9d50890adc22047cfae1db4cb957a68c5b663d22..da8e8852260a106248e1e1955152fe3e350ca069 100644
(file)
--- a/
src/shared/cgroup-util.c
+++ b/
src/shared/cgroup-util.c
@@
-161,7
+161,7
@@
int cg_kill(const char *controller, const char *path, int sig, bool sigcont, boo
* tasks list, to properly handle forking processes */
if (!s) {
* tasks list, to properly handle forking processes */
if (!s) {
- s = allocated_set = set_new(
trivial_hash_func, trivial_compare_func
);
+ s = allocated_set = set_new(
NULL
);
if (!s)
return -ENOMEM;
}
if (!s)
return -ENOMEM;
}
@@
-239,7
+239,7
@@
int cg_kill_recursive(const char *controller, const char *path, int sig, bool si
assert(sig >= 0);
if (!s) {
assert(sig >= 0);
if (!s) {
- s = allocated_set = set_new(
trivial_hash_func, trivial_compare_func
);
+ s = allocated_set = set_new(
NULL
);
if (!s)
return -ENOMEM;
}
if (!s)
return -ENOMEM;
}
@@
-290,7
+290,7
@@
int cg_migrate(const char *cfrom, const char *pfrom, const char *cto, const char
assert(cto);
assert(pto);
assert(cto);
assert(pto);
- s = set_new(
trivial_hash_func, trivial_compare_func
);
+ s = set_new(
NULL
);
if (!s)
return -ENOMEM;
if (!s)
return -ENOMEM;
@@
-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;
}
@@
-643,9
+641,9
@@
int cg_attach(const char *controller, const char *path, pid_t pid) {
if (pid == 0)
pid = getpid();
if (pid == 0)
pid = getpid();
- snprintf(c, sizeof(c),
"%lu\n", (unsigned long)
pid);
+ snprintf(c, sizeof(c),
PID_FMT"\n",
pid);
- return write_string_file(fs, c);
+ return write_string_file
_no_create
(fs, c);
}
int cg_attach_fallback(const char *controller, const char *path, pid_t pid) {
}
int cg_attach_fallback(const char *controller, const char *path, pid_t pid) {
@@
-755,9
+753,9
@@
int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
cs = strlen(controller);
FOREACH_LINE(line, f, return -errno) {
cs = strlen(controller);
FOREACH_LINE(line, f, return -errno) {
- char *l, *p, *
w, *
e;
+ char *l, *p, *e;
size_t k;
size_t k;
- c
har
*state;
+ c
onst char *word,
*state;
bool found = false;
truncate_nl(line);
bool found = false;
truncate_nl(line);
@@
-773,16
+771,16
@@
int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
*e = 0;
*e = 0;
- FOREACH_WORD_SEPARATOR(w, k, l, ",", state) {
+ FOREACH_WORD_SEPARATOR(w
ord
, k, l, ",", state) {
- if (k == cs && memcmp(w, controller, cs) == 0) {
+ if (k == cs && memcmp(w
ord
, controller, cs) == 0) {
found = true;
break;
}
if (k == 5 + cs &&
found = true;
break;
}
if (k == 5 + cs &&
- memcmp(w, "name=", 5) == 0 &&
- memcmp(w+5, controller, cs) == 0) {
+ memcmp(w
ord
, "name=", 5) == 0 &&
+ memcmp(w
ord
+5, controller, cs) == 0) {
found = true;
break;
}
found = true;
break;
}
@@
-819,7
+817,7
@@
int cg_install_release_agent(const char *controller, const char *agent) {
sc = strstrip(contents);
if (sc[0] == 0) {
sc = strstrip(contents);
if (sc[0] == 0) {
- r = write_string_file(fs, agent);
+ r = write_string_file
_no_create
(fs, agent);
if (r < 0)
return r;
} else if (!streq(sc, agent))
if (r < 0)
return r;
} else if (!streq(sc, agent))
@@
-839,7
+837,7
@@
int cg_install_release_agent(const char *controller, const char *agent) {
sc = strstrip(contents);
if (streq(sc, "0")) {
sc = strstrip(contents);
if (streq(sc, "0")) {
- r = write_string_file(fs, "1");
+ r = write_string_file
_no_create
(fs, "1");
if (r < 0)
return r;
if (r < 0)
return r;
@@
-860,7
+858,7
@@
int cg_uninstall_release_agent(const char *controller) {
if (r < 0)
return r;
if (r < 0)
return r;
- r = write_string_file(fs, "0");
+ r = write_string_file
_no_create
(fs, "0");
if (r < 0)
return r;
if (r < 0)
return r;
@@
-871,7
+869,7
@@
int cg_uninstall_release_agent(const char *controller) {
if (r < 0)
return r;
if (r < 0)
return r;
- r = write_string_file(fs, "");
+ r = write_string_file
_no_create
(fs, "");
if (r < 0)
return r;
if (r < 0)
return r;
@@
-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;
}
@@
-1310,9
+1306,8
@@
int cg_pid_get_machine_name(pid_t pid, char **machine) {
}
int cg_path_get_session(const char *path, char **session) {
}
int cg_path_get_session(const char *path, char **session) {
- const char *e, *n, *x;
+ const char *e, *n, *x
, *y
;
char *s;
char *s;
- size_t l;
assert(path);
assert(path);
@@
-1329,17
+1324,14
@@
int cg_path_get_session(const char *path, char **session) {
x = startswith(s, "session-");
if (!x)
return -ENOENT;
x = startswith(s, "session-");
if (!x)
return -ENOENT;
- if (!endswith(x, ".scope"))
- return -ENOENT;
-
- l = strlen(x);
- if (l <= 6)
+ y = endswith(x, ".scope");
+ if (!y || x == y)
return -ENOENT;
if (session) {
char *r;
return -ENOENT;
if (session) {
char *r;
- r = strndup(x,
l - 6
);
+ r = strndup(x,
y - x
);
if (!r)
return -ENOMEM;
if (!r)
return -ENOMEM;
@@
-1595,7
+1587,7
@@
int cg_set_attribute(const char *controller, const char *path, const char *attri
if (r < 0)
return r;
if (r < 0)
return r;
- return write_string_file(p, value);
+ return write_string_file
_no_create
(p, value);
}
static const char mask_names[] =
}
static const char mask_names[] =