From: Tobias Stoeckmann Date: Wed, 18 Mar 2026 08:12:51 +0000 (+0100) Subject: Remove periods from error messages X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=53755dc95128f0c9f5e965bd9722afc5a91df56e;p=thirdparty%2Flibarchive.git Remove periods from error messages Some error messages previously slipped through. Remove periods from these messages as well. Signed-off-by: Tobias Stoeckmann --- diff --git a/cpio/cpio.c b/cpio/cpio.c index 9a6a558d1..cddd604fd 100644 --- a/cpio/cpio.c +++ b/cpio/cpio.c @@ -526,7 +526,7 @@ mode_out(struct cpio *cpio) int r; if (cpio->option_append) - lafe_errc(1, 0, "Append mode not yet supported."); + lafe_errc(1, 0, "Append mode not yet supported"); cpio->archive_read_disk = archive_read_disk_new(); if (cpio->archive_read_disk == NULL) @@ -884,7 +884,7 @@ entry_to_archive(struct cpio *cpio, struct archive_entry *entry) if (bytes_write < bytes_read) { lafe_warnc(0, "Truncated write; file may have " - "grown while being archived."); + "grown while being archived"); } bytes_read = read(fd, buff, sizeof(buff)); } diff --git a/libarchive/archive_check_magic.c b/libarchive/archive_check_magic.c index 239cfb396..b6e125794 100644 --- a/libarchive/archive_check_magic.c +++ b/libarchive/archive_check_magic.c @@ -148,7 +148,7 @@ __archive_check_magic(struct archive *a, unsigned int magic, if (!handle_type) { errmsg("PROGRAMMER ERROR: Function "); errmsg(function); - errmsg(" invoked with invalid archive handle.\n"); + errmsg(" invoked with invalid archive handle\n"); diediedie(); } diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c index f57777ec0..e5f89bdc8 100644 --- a/libarchive/archive_read.c +++ b/libarchive/archive_read.c @@ -171,7 +171,7 @@ static int64_t client_skip_proxy(struct archive_read_filter *self, int64_t request) { if (request < 0) - __archive_errx(1, "Negative skip requested."); + __archive_errx(1, "Negative skip requested"); if (request == 0) return 0; diff --git a/libarchive/archive_read_support_filter_lz4.c b/libarchive/archive_read_support_filter_lz4.c index 144572ef2..acd7f5157 100644 --- a/libarchive/archive_read_support_filter_lz4.c +++ b/libarchive/archive_read_support_filter_lz4.c @@ -363,7 +363,7 @@ lz4_filter_read(struct archive_read_filter *self, const void **p) case READ_LEGACY_STREAM: /* Reading a lz4 stream already failed. */ archive_set_error(&self->archive->archive, - ARCHIVE_ERRNO_MISC, "Invalid sequence."); + ARCHIVE_ERRNO_MISC, "Invalid sequence"); return (ARCHIVE_FATAL); case READ_DEFAULT_BLOCK: ret = lz4_filter_read_default_stream(self, p); @@ -377,7 +377,7 @@ lz4_filter_read(struct archive_read_filter *self, const void **p) break; default: archive_set_error(&self->archive->archive, - ARCHIVE_ERRNO_MISC, "Program error."); + ARCHIVE_ERRNO_MISC, "Program error"); return (ARCHIVE_FATAL); } diff --git a/libarchive/archive_read_support_format_7zip.c b/libarchive/archive_read_support_format_7zip.c index 66147fa39..bab886a4e 100644 --- a/libarchive/archive_read_support_format_7zip.c +++ b/libarchive/archive_read_support_format_7zip.c @@ -1581,7 +1581,7 @@ init_decompression(struct archive_read *a, struct _7zip *zip, -15 /* Don't check for zlib header */); if (r != Z_OK) { archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Couldn't initialize zlib stream."); + "Couldn't initialize zlib stream"); return (ARCHIVE_FAILED); } zip->stream_valid = 1; diff --git a/libarchive/archive_read_support_format_cab.c b/libarchive/archive_read_support_format_cab.c index cc43ec1d1..57c462788 100644 --- a/libarchive/archive_read_support_format_cab.c +++ b/libarchive/archive_read_support_format_cab.c @@ -1452,7 +1452,7 @@ cab_read_ahead_cfdata_deflate(struct archive_read *a, ssize_t *avail) -15 /* Don't check for zlib header */); if (r != Z_OK) { archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Can't initialize deflate decompression."); + "Can't initialize deflate decompression"); *avail = ARCHIVE_FATAL; return (NULL); } diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c index d5c6a0880..b2f662b38 100644 --- a/libarchive/archive_read_support_format_iso9660.c +++ b/libarchive/archive_read_support_format_iso9660.c @@ -1663,7 +1663,7 @@ zisofs_read_data(struct archive_read *a, r = inflateInit(&zisofs->stream); if (r != Z_OK) { archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Can't initialize zisofs decompression."); + "Can't initialize zisofs decompression"); return (ARCHIVE_FATAL); } zisofs->stream_valid = 1; diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c index f680e3fe3..8844dd13b 100644 --- a/libarchive/archive_read_support_format_rar.c +++ b/libarchive/archive_read_support_format_rar.c @@ -2769,12 +2769,12 @@ add_value(struct archive_read *a, struct huffman_code *code, int value, if ((repeatnode = new_node(code)) < 0) { archive_set_error(&a->archive, ENOMEM, - "Unable to allocate memory for node data."); + "Unable to allocate memory for node data"); return (ARCHIVE_FATAL); } if ((nextnode = new_node(code)) < 0) { archive_set_error(&a->archive, ENOMEM, - "Unable to allocate memory for node data."); + "Unable to allocate memory for node data"); return (ARCHIVE_FATAL); } diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c index f0789bc5c..24a4abcdb 100644 --- a/libarchive/archive_read_support_format_zip.c +++ b/libarchive/archive_read_support_format_zip.c @@ -2527,7 +2527,7 @@ zip_deflate_init(struct archive_read *a, struct zip *zip) -15 /* Don't check for zlib header */); if (r != Z_OK) { archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Can't initialize ZIP decompression."); + "Can't initialize ZIP decompression"); return (ARCHIVE_FATAL); } /* Stream structure has been set up. */ diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c index e1ce5d572..14dc7339e 100644 --- a/libarchive/archive_write.c +++ b/libarchive/archive_write.c @@ -742,7 +742,7 @@ _archive_write_header(struct archive *_a, struct archive_entry *entry) if (a->format_write_header == NULL) { archive_set_error(&(a->archive), -1, - "Format must be set before you can write to an archive."); + "Format must be set before you can write to an archive"); a->archive.state = ARCHIVE_STATE_FATAL; return (ARCHIVE_FATAL); } diff --git a/libarchive/archive_write_set_format_iso9660.c b/libarchive/archive_write_set_format_iso9660.c index fcebac286..359a27373 100644 --- a/libarchive/archive_write_set_format_iso9660.c +++ b/libarchive/archive_write_set_format_iso9660.c @@ -7964,7 +7964,7 @@ zisofs_extract(struct archive_write *a, struct zisofs_extract *zisofs, r = inflateInit(&zisofs->stream); if (r != Z_OK) { archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Can't initialize zisofs decompression."); + "Can't initialize zisofs decompression"); return (ARCHIVE_FATAL); } zisofs->stream_valid = 1; diff --git a/tar/bsdtar.c b/tar/bsdtar.c index bdaddab20..fbc0627a8 100644 --- a/tar/bsdtar.c +++ b/tar/bsdtar.c @@ -1026,7 +1026,7 @@ main(int argc, char **argv) if (bsdtar->return_value != 0) lafe_warnc(0, - "Error exit delayed from previous errors."); + "Error exit delayed from previous errors"); return (bsdtar->return_value); } diff --git a/tar/read.c b/tar/read.c index 7cbcfb19f..4acbf6b2a 100644 --- a/tar/read.c +++ b/tar/read.c @@ -255,7 +255,7 @@ read_archive(struct bsdtar *bsdtar, char mode, struct archive *writer) break; p = archive_entry_pathname(entry); if (p == NULL || p[0] == '\0') { - lafe_warnc(0, "Archive entry has empty or unreadable filename ... skipping."); + lafe_warnc(0, "Archive entry has empty or unreadable filename ... skipping"); bsdtar->return_value = 1; continue; } diff --git a/tar/write.c b/tar/write.c index d414d283b..abff3831b 100644 --- a/tar/write.c +++ b/tar/write.c @@ -301,7 +301,7 @@ tar_mode_r(struct bsdtar *bsdtar) archive_read_free(a); close(bsdtar->fd); lafe_errc(1, 0, - "Cannot append to compressed archive."); + "Cannot append to compressed archive"); } /* Keep going until we hit end-of-archive */ format = archive_format(a); @@ -329,7 +329,7 @@ tar_mode_r(struct bsdtar *bsdtar) if (format != (int)(archive_format(a) & ARCHIVE_FORMAT_BASE_MASK) && format != ARCHIVE_FORMAT_EMPTY) { lafe_errc(1, 0, - "Format %s is incompatible with the archive %s.", + "Format %s is incompatible with the archive %s", cset_get_format(bsdtar->cset), bsdtar->filename); } } else { @@ -394,7 +394,7 @@ tar_mode_u(struct bsdtar *bsdtar) archive_read_free(a); close(bsdtar->fd); lafe_errc(1, 0, - "Cannot append to compressed archive."); + "Cannot append to compressed archive"); } if (archive_match_exclude_entry(bsdtar->matching, ARCHIVE_MATCH_MTIME | ARCHIVE_MATCH_OLDER | @@ -786,7 +786,7 @@ copy_file_data_block(struct bsdtar *bsdtar, struct archive *a, * continue. */ lafe_warnc(0, "%s: Truncated write; file may " - "have grown while being archived.", + "have grown while being archived", archive_entry_pathname(entry)); return (0); } @@ -805,7 +805,7 @@ copy_file_data_block(struct bsdtar *bsdtar, struct archive *a, /* Write was truncated; warn but continue. */ lafe_warnc(0, "%s: Truncated write; file may have grown " - "while being archived.", + "while being archived", archive_entry_pathname(entry)); return (0); } @@ -1052,14 +1052,14 @@ test_for_append(struct bsdtar *bsdtar) if (*bsdtar->argv == NULL && bsdtar->names_from_file == NULL) lafe_errc(1, 0, "no files or directories specified"); if (bsdtar->filename == NULL) - lafe_errc(1, 0, "Cannot append to stdout."); + lafe_errc(1, 0, "Cannot append to stdout"); if (stat(bsdtar->filename, &s) != 0) return; if (!S_ISREG(s.st_mode) && !S_ISBLK(s.st_mode)) lafe_errc(1, 0, - "Cannot append to %s: not a regular file.", + "Cannot append to %s: not a regular file", bsdtar->filename); /* Is this an appropriate check here on Windows? */