From: Tim Kientzle <kientzle@acm.org>
Date: Sat, 27 Dec 2025 18:31:27 +0000 (-0800)
Subject: Merge pull request #2827 from AZero13/free
X-Git-Tag: v3.8.5~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d70f77268c83ddb9bf27e265b12494e4ab2e9e0;p=thirdparty%2Flibarchive.git

Merge pull request #2827 from AZero13/free

Simplify file free

(cherry picked from commit 090fbc3655d8178046bdd7a329980b4bc23300bf)
---

diff --git a/libarchive/archive_write_open_fd.c b/libarchive/archive_write_open_fd.c
index ba034ed92..a79555202 100644
--- a/libarchive/archive_write_open_fd.c
+++ b/libarchive/archive_write_open_fd.c
@@ -135,11 +135,7 @@ file_write(struct archive *a, void *client_data, const void *buff, size_t length
 static int
 file_free(struct archive *a, void *client_data)
 {
-	struct write_fd_data	*mine = (struct write_fd_data *)client_data;
-
 	(void)a; /* UNUSED */
-	if (mine == NULL)
-		return (ARCHIVE_OK);
-	free(mine);
+	free(client_data);
 	return (ARCHIVE_OK);
 }
diff --git a/libarchive/archive_write_open_file.c b/libarchive/archive_write_open_file.c
index 0b310f3da..6271b368d 100644
--- a/libarchive/archive_write_open_file.c
+++ b/libarchive/archive_write_open_file.c
@@ -96,11 +96,7 @@ file_write(struct archive *a, void *client_data, const void *buff, size_t length
 static int
 file_free(struct archive *a, void *client_data)
 {
-	struct write_FILE_data	*mine = client_data;
-
 	(void)a; /* UNUSED */
-	if (mine == NULL)
-		return (ARCHIVE_OK);
-	free(mine);
+	free(client_data);
 	return (ARCHIVE_OK);
 }
diff --git a/libarchive/archive_write_open_memory.c b/libarchive/archive_write_open_memory.c
index e31650447..3b929ac7f 100644
--- a/libarchive/archive_write_open_memory.c
+++ b/libarchive/archive_write_open_memory.c
@@ -104,11 +104,7 @@ memory_write(struct archive *a, void *client_data, const void *buff, size_t leng
 static int
 memory_write_free(struct archive *a, void *client_data)
 {
-	struct write_memory_data *mine;
 	(void)a; /* UNUSED */
-	mine = client_data;
-	if (mine == NULL)
-		return (ARCHIVE_OK);
-	free(mine);
+	free(client_data);
 	return (ARCHIVE_OK);
 }