From: Tim Kientzle <kientzle@acm.org>
Date: Thu, 19 Jun 2025 23:12:26 +0000 (-0700)
Subject: Merge pull request #2677 from AZero13/fwrite
X-Git-Tag: v3.8.2~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f75fb1a13fcdcd1797c48050778bed4266f25b26;p=thirdparty%2Flibarchive.git

Merge pull request #2677 from AZero13/fwrite

Change error message from "fwrite function failed" to "write function failed"

(cherry picked from commit e4978e2edd2b59ef93304e3534622a0647f05a73)
---

diff --git a/libarchive/archive_write_set_format_7zip.c b/libarchive/archive_write_set_format_7zip.c
index 902d03f6a..ebdb16e90 100644
--- a/libarchive/archive_write_set_format_7zip.c
+++ b/libarchive/archive_write_set_format_7zip.c
@@ -686,7 +686,7 @@ write_to_temp(struct archive_write *a, const void *buff, size_t s)
 		ws = write(zip->temp_fd, p, s);
 		if (ws < 0) {
 			archive_set_error(&(a->archive), errno,
-			    "fwrite function failed");
+			    "write function failed");
 			return (ARCHIVE_FATAL);
 		}
 		s -= ws;
diff --git a/libarchive/archive_write_set_format_xar.c b/libarchive/archive_write_set_format_xar.c
index 3775e9f58..bb2ba97e4 100644
--- a/libarchive/archive_write_set_format_xar.c
+++ b/libarchive/archive_write_set_format_xar.c
@@ -689,7 +689,7 @@ write_to_temp(struct archive_write *a, const void *buff, size_t s)
 		ws = write(xar->temp_fd, p, s);
 		if (ws < 0) {
 			archive_set_error(&(a->archive), errno,
-			    "fwrite function failed");
+			    "write function failed");
 			return (ARCHIVE_FATAL);
 		}
 		s -= ws;