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 902d03f6a8faa1c8932e0240641ee2177a9506fd..ebdb16e9022ae172d56e6402d7d367bc06626f15 100644 (file)
--- 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 3775e9f5819a77583768d20058b98dbfb8249dee..bb2ba97e4bc333e5f53ccb773e6b50c594951d68 100644 (file)
--- 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;