chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
14ed8b9
)
import: print friendly error messages on errors
author
Lennart Poettering
<lennart@poettering.net>
Wed, 24 Dec 2014 15:43:20 +0000
(16:43 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 24 Dec 2014 15:53:05 +0000
(16:53 +0100)
src/import/import-dkr.c
patch
|
blob
|
history
diff --git
a/src/import/import-dkr.c
b/src/import/import-dkr.c
index e7dbe0f6626e75c9f3ee4b8cb47a31b825aef651..05b10621bc243039d208a5cf1b5669645b604715 100644
(file)
--- a/
src/import/import-dkr.c
+++ b/
src/import/import-dkr.c
@@
-822,7
+822,7
@@
static size_t dkr_import_job_write_callback(void *contents, size_t size, size_t
l = fwrite(contents, size, nmemb, j->tar_stream);
if (l != nmemb) {
- r =
-errno
;
+ r =
log_error_errno(errno, "Failed to write to tar: %m")
;
goto fail;
}
@@
-830,13
+830,14
@@
static size_t dkr_import_job_write_callback(void *contents, size_t size, size_t
}
if (j->payload_size + sz > PAYLOAD_MAX) {
+ log_error("Payload too large.");
r = -EFBIG;
goto fail;
}
p = realloc(j->payload, j->payload_size + sz);
if (!p) {
- r =
-ENOMEM
;
+ r =
log_oom()
;
goto fail;
}