diff options
author | kientzle <kientzle@FreeBSD.org> | 2004-08-14 03:45:45 +0000 |
---|---|---|
committer | kientzle <kientzle@FreeBSD.org> | 2004-08-14 03:45:45 +0000 |
commit | 49a8ad2487b2329a538450200f1b1b2d698d6a23 (patch) | |
tree | c8c3ea449972625054a074cdd1e21e770642ffbb /lib/libarchive/archive_read_support_compression_compress.c | |
parent | 136013f29f7390ade8ad49fc70a7a0ef804d10b3 (diff) | |
download | FreeBSD-src-49a8ad2487b2329a538450200f1b1b2d698d6a23.zip FreeBSD-src-49a8ad2487b2329a538450200f1b1b2d698d6a23.tar.gz |
Eliminate reliance on non-portable <err.h> by implementing a very
simple errx() function.
Improve behavior when bzlib/zlib are missing by detecting and
issuing an error message on attempts to read gzip/bzip2 compressed
archives.
Diffstat (limited to 'lib/libarchive/archive_read_support_compression_compress.c')
-rw-r--r-- | lib/libarchive/archive_read_support_compression_compress.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/libarchive/archive_read_support_compression_compress.c b/lib/libarchive/archive_read_support_compression_compress.c index 2a86c2f..93683eb 100644 --- a/lib/libarchive/archive_read_support_compression_compress.c +++ b/lib/libarchive/archive_read_support_compression_compress.c @@ -67,7 +67,6 @@ #include "archive_platform.h" __FBSDID("$FreeBSD$"); -#include <err.h> #include <errno.h> #include <stdlib.h> #include <string.h> @@ -318,9 +317,8 @@ read_consume(struct archive *a, size_t n) a->file_position += n; state->read_next += n; if (state->read_next > state->next_out) - errx(1, "Internal error: Request to consume too many " - "bytes from %s decompressor.\n", - a->compression_name); + __archive_errx(1, "Request to consume too many " + "bytes from compress decompressor"); return (n); } |