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/readahead | |
| 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/readahead')
| -rw-r--r-- | src/readahead/readahead-collect.c | 9 | ||||
| -rw-r--r-- | src/readahead/readahead-replay.c | 3 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/readahead/readahead-collect.c b/src/readahead/readahead-collect.c index 45d489a60e..4fcf64c24d 100644 --- a/src/readahead/readahead-collect.c +++ b/src/readahead/readahead-collect.c @@ -242,8 +242,7 @@ static int collect(const char *root) { assert(root); if (asprintf(&pack_fn, "%s/.readahead", root) < 0) { - log_error("Out of memory."); - r = -ENOMEM; + r = log_oom(); goto finish; } @@ -477,8 +476,7 @@ done: log_debug("On btrfs: %s", yes_no(on_btrfs)); if (asprintf(&pack_fn_new, "%s/.readahead.new", root) < 0) { - log_error("Out of memory."); - r = -ENOMEM; + r = log_oom(); goto finish; } @@ -510,8 +508,7 @@ done: n = hashmap_size(files); if (!(ordered = new(struct item, n))) { - log_error("Out of memory."); - r = -ENOMEM; + r = log_oom(); goto finish; } diff --git a/src/readahead/readahead-replay.c b/src/readahead/readahead-replay.c index f90821e831..a1ac6b0c91 100644 --- a/src/readahead/readahead-replay.c +++ b/src/readahead/readahead-replay.c @@ -150,8 +150,7 @@ static int replay(const char *root) { block_bump_request_nr(root); if (asprintf(&pack_fn, "%s/.readahead", root) < 0) { - log_error("Out of memory."); - r = -ENOMEM; + r = log_oom(); goto finish; } |