From: Roman Neuhauser Date: Mon, 4 Apr 2011 11:34:24 +0000 (-0400) Subject: remove archive_read_get_bidder macro again X-Git-Tag: v3.0.0a~529 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a577d93f489f6f0548f17df88b7819d6aaa00a6;p=thirdparty%2Flibarchive.git remove archive_read_get_bidder macro again Tim dislikes the hidden return statement SVN-Revision: 3157 --- diff --git a/libarchive/archive_read_private.h b/libarchive/archive_read_private.h index b1a71d79b..fe47b97d1 100644 --- a/libarchive/archive_read_private.h +++ b/libarchive/archive_read_private.h @@ -193,15 +193,6 @@ int __archive_read_register_format(struct archive_read *a, int __archive_read_get_bidder(struct archive_read *a, struct archive_read_filter_bidder **bidder); -#define archive_read_get_bidder(__a, __b) \ - do { \ - int r = __archive_read_get_bidder(__a, &(__b)); \ - if (r != ARCHIVE_OK) \ - return (r); \ - if ((__b) == NULL) \ - return (ARCHIVE_FATAL); \ - } while (0) - const void *__archive_read_ahead(struct archive_read *, size_t, ssize_t *); const void *__archive_read_filter_ahead(struct archive_read_filter *, size_t, ssize_t *); diff --git a/libarchive/archive_read_support_filter_bzip2.c b/libarchive/archive_read_support_filter_bzip2.c index d1bab5a79..894ddc907 100644 --- a/libarchive/archive_read_support_filter_bzip2.c +++ b/libarchive/archive_read_support_filter_bzip2.c @@ -88,7 +88,8 @@ archive_read_support_compression_bzip2(struct archive *_a) struct archive_read *a = (struct archive_read *)_a; struct archive_read_filter_bidder *reader; - archive_read_get_bidder(a, reader); + if (__archive_read_get_bidder(a, &reader) != ARCHIVE_OK) + return (ARCHIVE_FATAL); reader->data = NULL; reader->bid = bzip2_reader_bid; diff --git a/libarchive/archive_read_support_filter_compress.c b/libarchive/archive_read_support_filter_compress.c index 359f66db9..7ca02545b 100644 --- a/libarchive/archive_read_support_filter_compress.c +++ b/libarchive/archive_read_support_filter_compress.c @@ -157,7 +157,8 @@ archive_read_support_compression_compress(struct archive *_a) struct archive_read *a = (struct archive_read *)_a; struct archive_read_filter_bidder *bidder; - archive_read_get_bidder(a, bidder); + if (__archive_read_get_bidder(a, &bidder) != ARCHIVE_OK) + return (ARCHIVE_FATAL); bidder->data = NULL; bidder->bid = compress_bidder_bid; diff --git a/libarchive/archive_read_support_filter_gzip.c b/libarchive/archive_read_support_filter_gzip.c index c6c63a9fe..51fdba8ce 100644 --- a/libarchive/archive_read_support_filter_gzip.c +++ b/libarchive/archive_read_support_filter_gzip.c @@ -94,7 +94,8 @@ archive_read_support_compression_gzip(struct archive *_a) struct archive_read *a = (struct archive_read *)_a; struct archive_read_filter_bidder *bidder; - archive_read_get_bidder(a, bidder); + if (__archive_read_get_bidder(a, &bidder) != ARCHIVE_OK) + return (ARCHIVE_FATAL); bidder->data = NULL; bidder->bid = gzip_bidder_bid; diff --git a/libarchive/archive_read_support_filter_program.c b/libarchive/archive_read_support_filter_program.c index 03eb0d318..1a9089cdf 100644 --- a/libarchive/archive_read_support_filter_program.c +++ b/libarchive/archive_read_support_filter_program.c @@ -164,7 +164,8 @@ archive_read_support_compression_program_signature(struct archive *_a, /* * Get a bidder object from the read core. */ - archive_read_get_bidder(a, bidder); + if (__archive_read_get_bidder(a, &bidder) != ARCHIVE_OK) + return (ARCHIVE_FATAL); /* * Allocate our private state. diff --git a/libarchive/archive_read_support_filter_rpm.c b/libarchive/archive_read_support_filter_rpm.c index f2ca0506d..81f35c814 100644 --- a/libarchive/archive_read_support_filter_rpm.c +++ b/libarchive/archive_read_support_filter_rpm.c @@ -79,7 +79,8 @@ archive_read_support_compression_rpm(struct archive *_a) struct archive_read *a = (struct archive_read *)_a; struct archive_read_filter_bidder *bidder; - archive_read_get_bidder(a, bidder); + if (__archive_read_get_bidder(a, &bidder) != ARCHIVE_OK) + return (ARCHIVE_FATAL); bidder->data = NULL; bidder->bid = rpm_bidder_bid; diff --git a/libarchive/archive_read_support_filter_uu.c b/libarchive/archive_read_support_filter_uu.c index 567b306b8..95dd5e2e9 100644 --- a/libarchive/archive_read_support_filter_uu.c +++ b/libarchive/archive_read_support_filter_uu.c @@ -79,7 +79,8 @@ archive_read_support_compression_uu(struct archive *_a) struct archive_read *a = (struct archive_read *)_a; struct archive_read_filter_bidder *bidder; - archive_read_get_bidder(a, bidder); + if (__archive_read_get_bidder(a, &bidder) != ARCHIVE_OK) + return (ARCHIVE_FATAL); bidder->data = NULL; bidder->bid = uudecode_bidder_bid; diff --git a/libarchive/archive_read_support_filter_xz.c b/libarchive/archive_read_support_filter_xz.c index 3b4147ea5..6f05d68a6 100644 --- a/libarchive/archive_read_support_filter_xz.c +++ b/libarchive/archive_read_support_filter_xz.c @@ -130,7 +130,8 @@ archive_read_support_compression_xz(struct archive *_a) struct archive_read *a = (struct archive_read *)_a; struct archive_read_filter_bidder *bidder; - archive_read_get_bidder(a, bidder); + if (__archive_read_get_bidder(a, &bidder) != ARCHIVE_OK) + return (ARCHIVE_FATAL); bidder->data = NULL; bidder->bid = xz_bidder_bid; @@ -162,7 +163,8 @@ archive_read_support_compression_lzma(struct archive *_a) struct archive_read *a = (struct archive_read *)_a; struct archive_read_filter_bidder *bidder; - archive_read_get_bidder(a, bidder); + if (__archive_read_get_bidder(a, &bidder) != ARCHIVE_OK) + return (ARCHIVE_FATAL); bidder->data = NULL; bidder->bid = lzma_bidder_bid; @@ -196,7 +198,8 @@ archive_read_support_compression_lzip(struct archive *_a) struct archive_read *a = (struct archive_read *)_a; struct archive_read_filter_bidder *bidder; - archive_read_get_bidder(a, bidder); + if (__archive_read_get_bidder(a, &bidder) != ARCHIVE_OK) + return (ARCHIVE_FATAL); bidder->data = NULL; bidder->bid = lzip_bidder_bid;