From: Emil Velikov Date: Sat, 14 Mar 2020 16:01:11 +0000 (+0000) Subject: reader: remove unused read_filter_bidder::options X-Git-Tag: v3.6.0~18^2~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b30dd6c2762b6c0cc9aeb676076f7619c49a381b;p=thirdparty%2Flibarchive.git 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 --- diff --git a/libarchive/archive_read_private.h b/libarchive/archive_read_private.h index c842e6f09..eae56c574 100644 --- 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 2e2eea690..2bd9b811e 100644 --- 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 3885a7cf6..b04a6fdf6 100644 --- 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 e05132dbf..94377ae82 100644 --- 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 84c86aeb4..51f9239fc 100644 --- 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 9fa9e2b0d..67b9a9550 100644 --- 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 c82a8e2f1..01cbf3813 100644 --- 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 43ee6c2b7..a9c4de1df 100644 --- 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 a1c392f4f..a2846b824 100644 --- 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 bf5b6f2b3..55d971fa4 100644 --- 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 ddd68392f..43b6a2e52 100644 --- 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 689c18ce4..30e51f9b8 100644 --- 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 11807cf67..86b7aafbc 100644 --- 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 af7eeb7c1..e40db9f0d 100644 --- 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);