diff options
| author | Tim Kientzle <kientzle@FreeBSD.org> | 2007-05-29 01:00:21 +0000 |
|---|---|---|
| committer | Tim Kientzle <kientzle@FreeBSD.org> | 2007-05-29 01:00:21 +0000 |
| commit | b48b40f1f8ccea70fb209a05ed3eee1031790500 (patch) | |
| tree | 793787ab8615d768ba51341dfd934a5fb3039728 /lib/libarchive/archive_read_extract.c | |
| parent | 8d573cc158d08773baa288fbe77a70fa6de9dea2 (diff) | |
Notes
Diffstat (limited to 'lib/libarchive/archive_read_extract.c')
| -rw-r--r-- | lib/libarchive/archive_read_extract.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/libarchive/archive_read_extract.c b/lib/libarchive/archive_read_extract.c index 464ebe9bef3c..c69c34f1c5de 100644 --- a/lib/libarchive/archive_read_extract.c +++ b/lib/libarchive/archive_read_extract.c @@ -99,9 +99,7 @@ archive_read_extract(struct archive *_a, struct archive_entry *entry, int flags) r = ARCHIVE_WARN; if (r != ARCHIVE_OK) /* If _write_header failed, copy the error. */ - archive_set_error(&a->archive, - archive_errno(extract->ad), - "%s", archive_error_string(extract->ad)); + archive_copy_error(&a->archive, extract->ad); else /* Otherwise, pour data into the entry. */ r = copy_data(_a, a->extract->ad); @@ -110,9 +108,7 @@ archive_read_extract(struct archive *_a, struct archive_entry *entry, int flags) r2 = ARCHIVE_WARN; /* Use the first message. */ if (r2 != ARCHIVE_OK && r == ARCHIVE_OK) - archive_set_error(&a->archive, - archive_errno(extract->ad), - "%s", archive_error_string(extract->ad)); + archive_copy_error(&a->archive, extract->ad); /* Use the worst error return. */ if (r2 < r) r = r2; |
