reader: remove unused read_filter_bidder::options

None of the filters set ::options and based on git log, none of them
ever did despite that the API/infra was added over 10 years ago.

Let's just drop it, removing the majority of archive_set_filter_option()
which is essentially dead code.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/libarchive/archive_read_private.h b/libarchive/archive_read_private.h
index c842e6f09ad8c5e64b8cb3e0a70eb46d7f8b4005..eae56c574f708304a66b82c9ea62f423d3afffeb 100644 (file)
--- a/libarchive/archive_read_private.h
+++ b/libarchive/archive_read_private.h
@@ -67,9 +67,6 @@ struct archive_read_filter_bidder {
            struct archive_read_filter *);
        /* Initialize a newly-created filter. */
        int (*init)(struct archive_read_filter *);
-       /* Set an option for the filter bidder. */
-       int (*options)(struct archive_read_filter_bidder *,
-           const char *key, const char *value);
        /* Release the bidder's configuration data. */
        int (*free)(struct archive_read_filter_bidder *);
 };

diff --git a/libarchive/archive_read_set_options.c b/libarchive/archive_read_set_options.c
index 2e2eea69058dae4807f799b9e094967570720ec4..2bd9b811eaf41bc53056445be306065bbeb0647c 100644 (file)
--- a/libarchive/archive_read_set_options.c
+++ b/libarchive/archive_read_set_options.c
@@ -112,37 +112,15 @@ static int
 archive_set_filter_option(struct archive *_a, const char *m, const char *o,
     const char *v)
 {
-       struct archive_read *a = (struct archive_read *)_a;
-       struct archive_read_filter *filter;
-       struct archive_read_filter_bidder *bidder;
-       int r, rv = ARCHIVE_WARN, matched_modules = 0;
-
-       for (filter = a->filter; filter != NULL; filter = filter->upstream) {
-               bidder = filter->bidder;
-               if (bidder == NULL)
-                       continue;
-               if (bidder->options == NULL)
-                       /* This bidder does not support option */
-                       continue;
-               if (m != NULL) {
-                       if (strcmp(filter->name, m) != 0)
-                               continue;
-                       ++matched_modules;
-               }
+       (void)_a; /* UNUSED */
+       (void)o; /* UNUSED */
+       (void)v; /* UNUSED */
 
-               r = bidder->options(bidder, o, v);
-
-               if (r == ARCHIVE_FATAL)
-                       return (ARCHIVE_FATAL);
-
-               if (r == ARCHIVE_OK)
-                       rv = ARCHIVE_OK;
-       }
        /* If the filter name didn't match, return a special code for
         * _archive_set_option[s]. */
-       if (m != NULL && matched_modules == 0)
+       if (m != NULL)
                return ARCHIVE_WARN - 1;
-       return (rv);
+       return ARCHIVE_WARN;
 }
 
 static int

diff --git a/libarchive/archive_read_support_filter_bzip2.c b/libarchive/archive_read_support_filter_bzip2.c
index 3885a7cf615336b733ba17db473d9050ad26a784..b04a6fdf6216e1f77f2d5d9a76c9515de6058e51 100644 (file)
--- a/libarchive/archive_read_support_filter_bzip2.c
+++ b/libarchive/archive_read_support_filter_bzip2.c
@@ -97,7 +97,6 @@ archive_read_support_filter_bzip2(struct archive *_a)
        reader->name = "bzip2";
        reader->bid = bzip2_reader_bid;
        reader->init = bzip2_reader_init;
-       reader->options = NULL;
        reader->free = bzip2_reader_free;
 #if defined(HAVE_BZLIB_H) && defined(BZ_CONFIG_ERROR)
        return (ARCHIVE_OK);

diff --git a/libarchive/archive_read_support_filter_compress.c b/libarchive/archive_read_support_filter_compress.c
index e05132dbfaec2cb0271a6d28a586142fe170c260..94377ae821feba7b7a505207d186ed450f33af68 100644 (file)
--- a/libarchive/archive_read_support_filter_compress.c
+++ b/libarchive/archive_read_support_filter_compress.c
@@ -166,7 +166,6 @@ archive_read_support_filter_compress(struct archive *_a)
        bidder->name = "compress (.Z)";
        bidder->bid = compress_bidder_bid;
        bidder->init = compress_bidder_init;
-       bidder->options = NULL;
        bidder->free = compress_bidder_free;
        return (ARCHIVE_OK);
 }

diff --git a/libarchive/archive_read_support_filter_grzip.c b/libarchive/archive_read_support_filter_grzip.c
index 84c86aeb4386987f2a8971e5c77e854f4b1314d4..51f9239fcbdbc94e79a78f695b2bbc6042cac486 100644 (file)
--- a/libarchive/archive_read_support_filter_grzip.c
+++ b/libarchive/archive_read_support_filter_grzip.c
@@ -76,7 +76,6 @@ archive_read_support_filter_grzip(struct archive *_a)
        reader->data = NULL;
        reader->bid = grzip_bidder_bid;
        reader->init = grzip_bidder_init;
-       reader->options = NULL;
        reader->free = grzip_reader_free;
        /* This filter always uses an external program. */
        archive_set_error(_a, ARCHIVE_ERRNO_MISC,

diff --git a/libarchive/archive_read_support_filter_gzip.c b/libarchive/archive_read_support_filter_gzip.c
index 9fa9e2b0ddb8ba5da806c780e8f4738a2d55c270..67b9a955087ec27c4b01d68492b868e1dfe022f5 100644 (file)
--- a/libarchive/archive_read_support_filter_gzip.c
+++ b/libarchive/archive_read_support_filter_gzip.c
@@ -110,7 +110,6 @@ archive_read_support_filter_gzip(struct archive *_a)
        bidder->name = "gzip";
        bidder->bid = gzip_bidder_bid;
        bidder->init = gzip_bidder_init;
-       bidder->options = NULL;
        bidder->free = NULL; /* No data, so no cleanup necessary. */
        /* Signal the extent of gzip support with the return value here. */
 #if HAVE_ZLIB_H

diff --git a/libarchive/archive_read_support_filter_lrzip.c b/libarchive/archive_read_support_filter_lrzip.c
index c82a8e2f13ea02752f86fc490dbe60b383d11214..01cbf38138461300595188e70b6b12cca5fbfe9b 100644 (file)
--- a/libarchive/archive_read_support_filter_lrzip.c
+++ b/libarchive/archive_read_support_filter_lrzip.c
@@ -76,7 +76,6 @@ archive_read_support_filter_lrzip(struct archive *_a)
        reader->name = "lrzip";
        reader->bid = lrzip_bidder_bid;
        reader->init = lrzip_bidder_init;
-       reader->options = NULL;
        reader->free = lrzip_reader_free;
        /* This filter always uses an external program. */
        archive_set_error(_a, ARCHIVE_ERRNO_MISC,

diff --git a/libarchive/archive_read_support_filter_lz4.c b/libarchive/archive_read_support_filter_lz4.c
index 43ee6c2b726600fdff92574e6467186b0c96667c..a9c4de1df432591b73853a6766999a21a2b4d38b 100644 (file)
--- a/libarchive/archive_read_support_filter_lz4.c
+++ b/libarchive/archive_read_support_filter_lz4.c
@@ -123,7 +123,6 @@ archive_read_support_filter_lz4(struct archive *_a)
        reader->name = "lz4";
        reader->bid = lz4_reader_bid;
        reader->init = lz4_reader_init;
-       reader->options = NULL;
        reader->free = lz4_reader_free;
 #if defined(HAVE_LIBLZ4)
        return (ARCHIVE_OK);

diff --git a/libarchive/archive_read_support_filter_lzop.c b/libarchive/archive_read_support_filter_lzop.c
index a1c392f4f3643ebf8147f61f54d65c1579d72e68..a2846b8248bbbeeca0eeccca1f016cb188bbd630 100644 (file)
--- a/libarchive/archive_read_support_filter_lzop.c
+++ b/libarchive/archive_read_support_filter_lzop.c
@@ -116,7 +116,6 @@ archive_read_support_filter_lzop(struct archive *_a)
        reader->data = NULL;
        reader->bid = lzop_bidder_bid;
        reader->init = lzop_bidder_init;
-       reader->options = NULL;
        reader->free = NULL;
        /* Signal the extent of lzop support with the return value here. */
 #if defined(HAVE_LZO_LZOCONF_H) && defined(HAVE_LZO_LZO1X_H)

diff --git a/libarchive/archive_read_support_filter_program.c b/libarchive/archive_read_support_filter_program.c
index bf5b6f2b3c8bd474478de76ca900e8211e158d47..55d971fa435c45e1e6e9e02a54ddb419fea0ef84 100644 (file)
--- a/libarchive/archive_read_support_filter_program.c
+++ b/libarchive/archive_read_support_filter_program.c
@@ -140,7 +140,6 @@ set_bidder_signature(struct archive_read_filter_bidder *bidder,
        bidder->data = state;
        bidder->bid = program_bidder_bid;
        bidder->init = program_bidder_init;
-       bidder->options = NULL;
        bidder->free = program_bidder_free;
        return (ARCHIVE_OK);
 }

diff --git a/libarchive/archive_read_support_filter_rpm.c b/libarchive/archive_read_support_filter_rpm.c
index ddd68392f788f3661df709d5bb4631c110ab9536..43b6a2e5211ee6f40b87fcf46f7deaafe2846409 100644 (file)
--- a/libarchive/archive_read_support_filter_rpm.c
+++ b/libarchive/archive_read_support_filter_rpm.c
@@ -88,7 +88,6 @@ archive_read_support_filter_rpm(struct archive *_a)
        bidder->name = "rpm";
        bidder->bid = rpm_bidder_bid;
        bidder->init = rpm_bidder_init;
-       bidder->options = NULL;
        bidder->free = NULL;
        return (ARCHIVE_OK);
 }

diff --git a/libarchive/archive_read_support_filter_uu.c b/libarchive/archive_read_support_filter_uu.c
index 689c18ce43904c6cdeaa474f2e663ee9afa825c0..30e51f9b8b112d6af4606acd3e4908e61b5cf3ed 100644 (file)
--- a/libarchive/archive_read_support_filter_uu.c
+++ b/libarchive/archive_read_support_filter_uu.c
@@ -92,7 +92,6 @@ archive_read_support_filter_uu(struct archive *_a)
        bidder->name = "uu";
        bidder->bid = uudecode_bidder_bid;
        bidder->init = uudecode_bidder_init;
-       bidder->options = NULL;
        bidder->free = NULL;
        return (ARCHIVE_OK);
 }

diff --git a/libarchive/archive_read_support_filter_xz.c b/libarchive/archive_read_support_filter_xz.c
index 11807cf6768bb5c6e2c2b1189adc4ff804232afe..86b7aafbcad78670b34cd99eead82bc99a70af41 100644 (file)
--- a/libarchive/archive_read_support_filter_xz.c
+++ b/libarchive/archive_read_support_filter_xz.c
@@ -124,7 +124,6 @@ archive_read_support_filter_xz(struct archive *_a)
        bidder->name = "xz";
        bidder->bid = xz_bidder_bid;
        bidder->init = xz_bidder_init;
-       bidder->options = NULL;
        bidder->free = NULL;
 #if HAVE_LZMA_H && HAVE_LIBLZMA
        return (ARCHIVE_OK);
@@ -159,7 +158,6 @@ archive_read_support_filter_lzma(struct archive *_a)
        bidder->name = "lzma";
        bidder->bid = lzma_bidder_bid;
        bidder->init = lzma_bidder_init;
-       bidder->options = NULL;
        bidder->free = NULL;
 #if HAVE_LZMA_H && HAVE_LIBLZMA
        return (ARCHIVE_OK);
@@ -195,7 +193,6 @@ archive_read_support_filter_lzip(struct archive *_a)
        bidder->name = "lzip";
        bidder->bid = lzip_bidder_bid;
        bidder->init = lzip_bidder_init;
-       bidder->options = NULL;
        bidder->free = NULL;
 #if HAVE_LZMA_H && HAVE_LIBLZMA
        return (ARCHIVE_OK);

diff --git a/libarchive/archive_read_support_filter_zstd.c b/libarchive/archive_read_support_filter_zstd.c
index af7eeb7c1e24a1f49b5353a7dba56322147e6194..e40db9f0ddff986824f7bc4420995f4aa7816ea4 100644 (file)
--- a/libarchive/archive_read_support_filter_zstd.c
+++ b/libarchive/archive_read_support_filter_zstd.c
@@ -95,7 +95,6 @@ archive_read_support_filter_zstd(struct archive *_a)
        bidder->name = "zstd";
        bidder->bid = zstd_bidder_bid;
        bidder->init = zstd_bidder_init;
-       bidder->options = NULL;
        bidder->free = NULL;
 #if HAVE_ZSTD_H && HAVE_LIBZSTD
        return (ARCHIVE_OK);