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 ba034ed92f8a1c634138f8c4b4c118a59c38e11d..a795552020df9eb0b6ab3cba56e171651f3a2b85 100644 (file)
--- 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 0b310f3da83b41cf1f04ed41c8484bda2dd03a9c..6271b368d07f3fb8792a3457560a69b406cd9ddf 100644 (file)
--- 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 e31650447279f8bb8cda8f265492e347499ab9b8..3b929ac7f60de738db6c7b2bf0ab60885d48038c 100644 (file)
--- 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);
 }