From: Sarah Gilmore <sgilmore@mathworks.com>
Date: Fri, 24 Mar 2023 13:52:36 +0000 (-0400)
Subject: Fix typo in calls to close_file_descriptor function
X-Git-Tag: v3.7.0~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c3b76ecb918ced5bde8a01a9c0e814cf14d3245;p=thirdparty%2Flibarchive.git

Fix typo in calls to close_file_descriptor function
---

diff --git a/libarchive/archive_write_disk_posix.c b/libarchive/archive_write_disk_posix.c
index 7ce25ea6c..f29d21d56 100644
--- a/libarchive/archive_write_disk_posix.c
+++ b/libarchive/archive_write_disk_posix.c
@@ -1732,7 +1732,7 @@ _archive_write_disk_finish_entry(struct archive *_a)
 				r = hfs_write_data_block(
 				    a, null_d, a->file_remaining_bytes);
 			if (r < 0)
-                close_file_descriptor(a->fd);
+                close_file_descriptor(a);
 				return ((int)r);
 		}
 #endif
@@ -1742,7 +1742,7 @@ _archive_write_disk_finish_entry(struct archive *_a)
 		    a->filesize == 0) {
 			archive_set_error(&a->archive, errno,
 			    "File size could not be restored");
-            close_file_descriptor(a->fd);
+            close_file_descriptor(a);
 			return (ARCHIVE_FAILED);
 		}
 #endif
@@ -1753,7 +1753,7 @@ _archive_write_disk_finish_entry(struct archive *_a)
 		 */
 		a->pst = NULL;
 		if ((ret = lazy_stat(a)) != ARCHIVE_OK)
-            close_file_descriptor(a->fd);
+            close_file_descriptor(a);
 			return (ret);
 		/* We can use lseek()/write() to extend the file if
 		 * ftruncate didn't work or isn't available. */
@@ -1762,13 +1762,13 @@ _archive_write_disk_finish_entry(struct archive *_a)
 			if (lseek(a->fd, a->filesize - 1, SEEK_SET) < 0) {
 				archive_set_error(&a->archive, errno,
 				    "Seek failed");
-                close_file_descriptor(a->fd);
+                close_file_descriptor(a);
 				return (ARCHIVE_FATAL);
 			}
 			if (write(a->fd, &nul, 1) < 0) {
 				archive_set_error(&a->archive, errno,
 				    "Write to restore size failed");
-                close_file_descriptor(a->fd);
+                close_file_descriptor(a);
 				return (ARCHIVE_FATAL);
 			}
 			a->pst = NULL;