From: Emil Velikov Date: Sat, 14 Mar 2020 19:41:27 +0000 (+0000) Subject: reader: remove unused archive_read_filter callbacks X-Git-Tag: v3.6.0~18^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70ee6cb8268a8a52bab7a14e59a3949f05b7d0c3;p=thirdparty%2Flibarchive.git reader: remove unused archive_read_filter callbacks In particular the ::open and ::sswitch callbacks are unused. Signed-off-by: Emil Velikov --- diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c index 9e9363d57..0ed27a8c0 100644 --- a/libarchive/archive_read.c +++ b/libarchive/archive_read.c @@ -486,10 +486,8 @@ archive_read_open1(struct archive *_a) filter->upstream = NULL; filter->archive = a; filter->data = a->client.dataset[0].data; - filter->open = client_open_proxy; filter->read = client_read_proxy; filter->close = client_close_proxy; - filter->sswitch = client_switch_proxy; filter->name = "none"; filter->code = ARCHIVE_FILTER_NONE; filter->can_skip = 1; diff --git a/libarchive/archive_read_private.h b/libarchive/archive_read_private.h index 38605b8f4..98d45fe87 100644 --- a/libarchive/archive_read_private.h +++ b/libarchive/archive_read_private.h @@ -87,14 +87,10 @@ struct archive_read_filter { struct archive_read_filter_bidder *bidder; /* My bidder. */ struct archive_read_filter *upstream; /* Who I read from. */ struct archive_read *archive; /* Associated archive. */ - /* Open a block for reading */ - int (*open)(struct archive_read_filter *self); /* Return next block. */ ssize_t (*read)(struct archive_read_filter *, const void **); /* Close (just this filter) and free(self). */ int (*close)(struct archive_read_filter *self); - /* Function that handles switching from reading one block to the next/prev */ - int (*sswitch)(struct archive_read_filter *self, unsigned int iindex); /* Read any header metadata if available. */ int (*read_header)(struct archive_read_filter *self, struct archive_entry *entry); /* My private data. */