From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 7 Apr 2021 09:36:52 +0000 (+0000)
Subject: archive: Drop useless archive_close function
X-Git-Tag: 0.9.28~1285^2~411
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7c608395c469da4769718bcefef2077d485ff69;p=pakfire.git

archive: Drop useless archive_close function

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/archive.c b/src/libpakfire/archive.c
index 6c761a90a..fdb679648 100644
--- a/src/libpakfire/archive.c
+++ b/src/libpakfire/archive.c
@@ -129,11 +129,6 @@ static int archive_open(PakfireArchive archive, struct archive** a) {
 	return 0;
 }
 
-static void archive_close(struct archive* a) {
-	archive_read_close(a);
-	archive_read_free(a);
-}
-
 static int archive_read(struct archive* a, void** data, size_t* data_size) {
 	*data = NULL;
 	*data_size = 0;
@@ -593,7 +588,7 @@ static int pakfire_archive_walk(PakfireArchive archive,
 	}
 
 	// Close the archive again
-	archive_close(a);
+	archive_read_free(a);
 
 	return r;
 }
@@ -677,7 +672,7 @@ static int pakfire_archive_try_open(PakfireArchive archive, const char* path) {
 	}
 
 	// Close archive
-	archive_close(a);
+	archive_read_free(a);
 
 	return 0;
 
@@ -832,9 +827,9 @@ PAKFIRE_EXPORT int pakfire_archive_read(PakfireArchive archive, const char* file
 
 out:
 	if (pa)
-		archive_close(pa);
+		archive_read_free(pa);
 
-	archive_close(a);
+	archive_read_free(a);
 
 	return r;
 }
@@ -888,9 +883,9 @@ PAKFIRE_EXPORT int pakfire_archive_extract(PakfireArchive archive, const char* p
 		prefix ? prefix : pakfire_get_path(archive->pakfire));
 
 	if (pa)
-		archive_close(pa);
+		archive_read_free(pa);
 
-	archive_close(a);
+	archive_read_free(a);
 
 	return r;
 }
@@ -1195,7 +1190,7 @@ PAKFIRE_EXPORT pakfire_archive_verify_status_t pakfire_archive_verify(PakfireArc
 	DEBUG(archive->pakfire, "Archive %p has been successfully verified\n", archive);
 
 END:
-	archive_close(a);
+	archive_read_free(a);
 
 	return status;
 }