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 b1a71d79b9c1eeda150208d91125485076f3a70f..fe47b97d1f540b008a9febf7a048de31558c06cc 100644 (file)
--- 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 d1bab5a79147ba3e2f6f9da32089f0d35b4dc58d..894ddc9072b61eeb6eac97c2dfc187722ab2629a 100644 (file)
--- 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 359f66db9ef0ca4a07409780be3327b2f9d55423..7ca02545b3009839ac668b06732726ffe403268c 100644 (file)
--- 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 c6c63a9fe4ef0b073ddbbef8708a880336f55577..51fdba8ce981afc7407f055f8965428e609cd601 100644 (file)
--- 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 03eb0d318927c6374c25711a7de330cdac043f15..1a9089cdf28feb0da7a1a4a3a71a887953ea744f 100644 (file)
--- 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 f2ca0506d2af686dc25a42f08f0d45f08df06d72..81f35c81449896fe589367919aeed0eb82964b27 100644 (file)
--- 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 567b306b8e56dfecca11fdb133bb06d611aca0f1..95dd5e2e982d80ea95260bbe295a765c6fb28376 100644 (file)
--- 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 3b4147ea58dc28c47a149fd3949355253b7595b7..6f05d68a67eee3fcf84defeec3e493e3f418afc5 100644 (file)
--- 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;