reader: remove the return type of archive_read_filter_bidder_vtable::free

From over a dozen filters, only one instance has the vfunc... Always
returning ARCHIVE_OK.

Let's just remove the return type.

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

diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c
index 38fc77d2921dd0045032d524c4d05ffb1bb548c2..01dcd5f1e6fc4804a1bcbfbd9b475b3e50b43a86 100644 (file)
--- a/libarchive/archive_read.c
+++ b/libarchive/archive_read.c
@@ -1104,9 +1104,7 @@ _archive_read_free(struct archive *_a)
        n = sizeof(a->bidders)/sizeof(a->bidders[0]);
        for (i = 0; i < n; i++) {
                if (a->bidders[i].free != NULL) {
-                       int r1 = (a->bidders[i].free)(&a->bidders[i]);
-                       if (r1 < r)
-                               r = r1;
+                       (a->bidders[i].free)(&a->bidders[i]);
                }
        }
 

diff --git a/libarchive/archive_read_private.h b/libarchive/archive_read_private.h
index eae56c574f708304a66b82c9ea62f423d3afffeb..539aae8ca2c9b9d9ff7917900002fe4f5fa18cad 100644 (file)
--- a/libarchive/archive_read_private.h
+++ b/libarchive/archive_read_private.h
@@ -68,7 +68,7 @@ struct archive_read_filter_bidder {
        /* Initialize a newly-created filter. */
        int (*init)(struct archive_read_filter *);
        /* Release the bidder's configuration data. */
-       int (*free)(struct archive_read_filter_bidder *);
+       void (*free)(struct archive_read_filter_bidder *);
 };
 
 /*

diff --git a/libarchive/archive_read_support_filter_program.c b/libarchive/archive_read_support_filter_program.c
index 55d971fa435c45e1e6e9e02a54ddb419fea0ef84..1ba63b5d63097a063706d7cb4f226a0a8407cc73 100644 (file)
--- a/libarchive/archive_read_support_filter_program.c
+++ b/libarchive/archive_read_support_filter_program.c
@@ -98,7 +98,7 @@ struct program_bidder {
 static int     program_bidder_bid(struct archive_read_filter_bidder *,
                    struct archive_read_filter *upstream);
 static int     program_bidder_init(struct archive_read_filter *);
-static int     program_bidder_free(struct archive_read_filter_bidder *);
+static void    program_bidder_free(struct archive_read_filter_bidder *);
 
 /*
  * The actual filter needs to track input and output data.
@@ -175,13 +175,12 @@ memerr:
        return (ARCHIVE_FATAL);
 }
 
-static int
+static void
 program_bidder_free(struct archive_read_filter_bidder *self)
 {
        struct program_bidder *state = (struct program_bidder *)self->data;
 
        free_state(state);
-       return (ARCHIVE_OK);
 }
 
 static void