chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
continue work with error messages, log_oom()
[elogind.git]
/
src
/
core
/
mount-setup.c
diff --git
a/src/core/mount-setup.c
b/src/core/mount-setup.c
index 07794df049adb65da3c8fe6e8c7add99973ac408..c10c6dad1c853f5c4fe3f4310a01de2ebfd7be30 100644
(file)
--- a/
src/core/mount-setup.c
+++ b/
src/core/mount-setup.c
@@
-190,8
+190,7
@@
int mount_cgroup_controllers(char ***join_controllers) {
controllers = set_new(string_hash_func, string_compare_func);
if (!controllers) {
controllers = set_new(string_hash_func, string_compare_func);
if (!controllers) {
- r = -ENOMEM;
- log_error("Failed to allocate controller set.");
+ r = log_oom();
goto finish;
}
goto finish;
}
@@
-262,9
+261,8
@@
int mount_cgroup_controllers(char ***join_controllers) {
options = strv_join(*k, ",");
if (!options) {
options = strv_join(*k, ",");
if (!options) {
- log_error("Failed to join options");
free(controller);
free(controller);
- r =
-ENOMEM
;
+ r =
log_oom()
;
goto finish;
}
goto finish;
}
@@
-275,9
+273,8
@@
int mount_cgroup_controllers(char ***join_controllers) {
where = strappend("/sys/fs/cgroup/", options);
if (!where) {
where = strappend("/sys/fs/cgroup/", options);
if (!where) {
- log_error("Failed to build path");
free(options);
free(options);
- r =
-ENOMEM
;
+ r =
log_oom()
;
goto finish;
}
goto finish;
}
@@
-306,8
+303,7
@@
int mount_cgroup_controllers(char ***join_controllers) {
t = strappend("/sys/fs/cgroup/", *i);
if (!t) {
t = strappend("/sys/fs/cgroup/", *i);
if (!t) {
- log_error("Failed to build path");
- r = -ENOMEM;
+ r = log_oom();
free(options);
goto finish;
}
free(options);
goto finish;
}