chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log.h: new log_oom() -> int -ENOMEM, use it
[elogind.git]
/
src
/
core
/
manager.c
diff --git
a/src/core/manager.c
b/src/core/manager.c
index 42a9490242abfaae21d2eaec82e50f0747e72f2b..bcaf913b5a8865c32785705af7dcf3351827fb60 100644
(file)
--- a/
src/core/manager.c
+++ b/
src/core/manager.c
@@
-1625,7
+1625,7
@@
void manager_send_unit_plymouth(Manager *m, Unit *u) {
}
if (asprintf(&message, "U\002%c%s%n", (int) (strlen(u->id) + 1), u->id, &n) < 0) {
}
if (asprintf(&message, "U\002%c%s%n", (int) (strlen(u->id) + 1), u->id, &n) < 0) {
- log_
error("Out of memory."
);
+ log_
oom(
);
goto finish;
}
goto finish;
}
@@
-2073,10
+2073,8
@@
static int create_generator_dir(Manager *m, char **generator, const char *name)
if (m->running_as == MANAGER_SYSTEM && getpid() == 1) {
p = strappend("/run/systemd/", name);
if (m->running_as == MANAGER_SYSTEM && getpid() == 1) {
p = strappend("/run/systemd/", name);
- if (!p) {
- log_error("Out of memory.");
- return -ENOMEM;
- }
+ if (!p)
+ return log_oom();
r = mkdir_p_label(p, 0755);
if (r < 0) {
r = mkdir_p_label(p, 0755);
if (r < 0) {
@@
-2086,10
+2084,8
@@
static int create_generator_dir(Manager *m, char **generator, const char *name)
}
} else {
p = strjoin("/tmp/systemd-", name, ".XXXXXX", NULL);
}
} else {
p = strjoin("/tmp/systemd-", name, ".XXXXXX", NULL);
- if (!p) {
- log_error("Out of memory.");
- return -ENOMEM;
- }
+ if (!p)
+ return log_oom();
if (!mkdtemp(p)) {
free(p);
if (!mkdtemp(p)) {
free(p);