From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sun, 15 Mar 2020 15:44:26 +0000 (+0000)
Subject: reader: remove the return type of archive_read_filter_bidder_vtable::free
X-Git-Tag: v3.6.0~18^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e0d31a7d2e7f66aab5a1c43579afbe864851200;p=thirdparty%2Flibarchive.git

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 38fc77d29..01dcd5f1e 100644
--- 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 eae56c574..539aae8ca 100644
--- 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 55d971fa4..1ba63b5d6 100644
--- 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