clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-01 11:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

log.h: new log_oom() -> int -ENOMEM, use it

Browse Source 
also a number of minor fixups and bug fixes: spelling, oom errors
that didn't print errors, not properly forwarding error codes,
few more consistency issues, et cetera
This commit is contained in:
Shawn Landden
2012-07-26 11:48:26 +02:00
committed by Kay Sievers
parent e146e4516b
commit 0d0f0c50d3
40 changed files with 183 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nspawn/nspawn.c
+15 -27
View File
@@ -205,10 +205,8 @@ static int parse_argv(int argc, char *argv[]) {
char *t;
t = strndup(word, length);
if (!t) {
log_error("Out of memory.");
return -ENOMEM;
}
if (!t)
return log_oom();
if (cap_from_name(t, &cap) < 0) {
log_error("Failed to parse capability %s.", t);
@@ -289,7 +287,7 @@ static int mount_all(const char *dest) {
int t;
if (asprintf(&where, "%s/%s", dest, mount_table[k].where) < 0) {
log_error("Out of memory.");
log_oom();
if (r == 0)
r = -ENOMEM;
@@ -335,20 +333,16 @@ static int setup_timezone(const char *dest) {
assert(dest);
/* Fix the timezone, if possible */
if (asprintf(&where, "%s/etc/localtime", dest) < 0) {
log_error("Out of memory.");
return -ENOMEM;
}
if (asprintf(&where, "%s/etc/localtime", dest) < 0)
return log_oom();
if (mount("/etc/localtime", where, "bind", MS_BIND, NULL) >= 0)
mount("/etc/localtime", where, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL);
free(where);
if (asprintf(&where, "%s/etc/timezone", dest) < 0) {
log_error("Out of memory.");
return -ENOMEM;
}
if (asprintf(&where, "%s/etc/timezone", dest) < 0)
return log_oom();
if (mount("/etc/timezone", where, "bind", MS_BIND, NULL) >= 0)
mount("/etc/timezone", where, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL);
@@ -368,8 +362,7 @@ static int setup_resolv_conf(const char *dest) {
/* Fix resolv.conf, if possible */
if (asprintf(&where, "%s/etc/resolv.conf", dest) < 0) {
log_error("Out of memory.");
return -ENOMEM;
return log_oom();
}
if (mount("/etc/resolv.conf", where, "bind", MS_BIND, NULL) >= 0)
@@ -480,8 +473,7 @@ static int setup_dev_console(const char *dest, const char *console) {
}
if (asprintf(&to, "%s/dev/console", dest) < 0) {
log_error("Out of memory.");
r = -ENOMEM;
r = log_oom();
goto finish;
}
@@ -535,14 +527,12 @@ static int setup_kmsg(const char *dest, int kmsg_socket) {
* avoid any problems with containers deadlocking due to this
* we simply make /dev/kmsg unavailable to the container. */
if (asprintf(&from, "%s/dev/kmsg", dest) < 0) {
log_error("Out of memory.");
r = -ENOMEM;
r = log_oom();
goto finish;
}
if (asprintf(&to, "%s/proc/kmsg", dest) < 0) {
log_error("Out of memory.");
r = -ENOMEM;
r = log_oom();
goto finish;
}
@@ -639,8 +629,7 @@ static int setup_journal(const char *directory) {
p = strappend(directory, "/etc/machine-id");
if (!p) {
log_error("Out of memory.");
r = -ENOMEM;
r = log_oom();
goto finish;
}
@@ -670,8 +659,7 @@ static int setup_journal(const char *directory) {
p = strappend("/var/log/journal/", l);
q = strjoin(directory, "/var/log/journal/", l, NULL);
if (!p || !q) {
log_error("Out of memory.");
r = -ENOMEM;
r = log_oom();
goto finish;
}
@@ -1296,13 +1284,13 @@ int main(int argc, char *argv[]) {
if ((asprintf((char**)(envp + 3), "HOME=%s", home ? home: "/root") < 0) ||
(asprintf((char**)(envp + 4), "USER=%s", arg_user ? arg_user : "root") < 0) ||
(asprintf((char**)(envp + 5), "LOGNAME=%s", arg_user ? arg_user : "root") < 0)) {
log_error("Out of memory.");
log_oom();
goto child_fail;
}
if (arg_uuid) {
if (asprintf((char**)(envp + 6), "container_uuid=%s", arg_uuid) < 0) {
log_error("Out of memory.");
log_oom();
goto child_fail;
}
}