diff options
author | Shawn Landden <shawnlandden@gmail.com> | 2012-07-25 14:55:59 -0700 |
---|---|---|
committer | Kay Sievers <kay@vrfy.org> | 2012-07-26 11:48:26 +0200 |
commit | 0d0f0c50d3a1d90f03972a6abb82e6413daaa583 (patch) | |
tree | 74f41c8455dbd78599f49300315a2569a8989992 /src/shared/util.c | |
parent | e146e4516b9ea9907852e7ad609de39dca9e8769 (diff) |
log.h: new log_oom() -> int -ENOMEM, use it
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
Diffstat (limited to 'src/shared/util.c')
-rw-r--r-- | src/shared/util.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/shared/util.c b/src/shared/util.c index 2e7ae63db2..5f360085a2 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -909,8 +909,7 @@ int load_env_file( continue; if (!(u = normalize_env_assignment(p))) { - log_error("Out of memory."); - r = -ENOMEM; + r = log_oom(); goto finish; } @@ -918,8 +917,7 @@ int load_env_file( free(u); if (!t) { - log_error("Out of memory."); - r = -ENOMEM; + r = log_oom(); goto finish; } @@ -4278,7 +4276,7 @@ void execute_directory(const char *directory, DIR *d, char *argv[]) { continue; if (asprintf(&path, "%s/%s", directory, de->d_name) < 0) { - log_error("Out of memory."); + log_oom(); continue; } |