Fix whitespace style in error messages

- Keep a whitespace between text and brackets
- No whitespace between text and colon
- No newline at end of error message

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>

diff --git a/libarchive/archive_read_support_format_7zip.c b/libarchive/archive_read_support_format_7zip.c
index 7ce057fb843dab5da2b1444a1d05079985f29776..8926ac50a1ed3843f051ef1f57dd9a180fec30c1 100644 (file)
--- a/libarchive/archive_read_support_format_7zip.c
+++ b/libarchive/archive_read_support_format_7zip.c
@@ -1777,7 +1777,7 @@ decompress(struct archive_read *a, struct _7zip *zip,
                default:
                        archive_set_error(&(a->archive),
                            ARCHIVE_ERRNO_MISC,
-                               "Decompression failed(%d)",
+                               "Decompression failed (%d)",
                            r);
                        return (ARCHIVE_FAILED);
                }

diff --git a/libarchive/archive_read_support_format_cab.c b/libarchive/archive_read_support_format_cab.c
index 57c462788a5932f26e060396049da7fb664137e4..d5488fd0584f79f854d00f386174379fcf124c49 100644 (file)
--- a/libarchive/archive_read_support_format_cab.c
+++ b/libarchive/archive_read_support_format_cab.c
@@ -1365,7 +1365,7 @@ cab_read_ahead_cfdata(struct archive_read *a, ssize_t *avail)
                return (cab_read_ahead_cfdata_lzx(a, avail));
        default: /* Unsupported compression. */
                archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
-                   "Unsupported CAB compression : %s",
+                   "Unsupported CAB compression: %s",
                    cab->entry_cffolder->compname);
                *avail = ARCHIVE_FAILED;
                return (NULL);

diff --git a/libarchive/archive_read_support_format_tar.c b/libarchive/archive_read_support_format_tar.c
index 6ca805b96809e7d9dda20f8d5ceb3ba0bdda2e9f..2979492767edf190ba6180353cb96b76b0b048f6 100644 (file)
--- a/libarchive/archive_read_support_format_tar.c
+++ b/libarchive/archive_read_support_format_tar.c
@@ -2255,12 +2255,12 @@ pax_attribute_SCHILY_acl(struct archive_read *a, struct tar *tar,
        if (r != ARCHIVE_OK) {
                if (r == ARCHIVE_FATAL) {
                        archive_set_error(&a->archive, ENOMEM,
-                           "%s %s", "Can't allocate memory for ",
+                           "%s %s", "Can't allocate memory for",
                            errstr);
                        return (r);
                }
                archive_set_error(&a->archive,
-                   ARCHIVE_ERRNO_MISC, "%s %s", "Parse error: ", errstr);
+                   ARCHIVE_ERRNO_MISC, "%s %s", "Parse error:", errstr);
        }
        return (r);
 }

diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c
index 247418603fbb328a6c74fa5315bcd7ae5f31dbd4..874501fc0782739ad87b045f56c748a97f7a03c6 100644 (file)
--- a/libarchive/archive_read_support_format_xar.c
+++ b/libarchive/archive_read_support_format_xar.c
@@ -1691,7 +1691,7 @@ decompress(struct archive_read *a, const void **buff, size_t *outbytes,
                default:
                        archive_set_error(&(a->archive),
                            ARCHIVE_ERRNO_MISC,
-                           "%s decompression failed(%d)",
+                           "%s decompression failed (%d)",
                            (xar->entry_encoding == XZ)?"xz":"lzma",
                            r);
                        return (ARCHIVE_FATAL);

diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c
index 24a4abcdb1d5d35a9ac2b89ccc7d5864ee5d9ea8..6711dd22550a0ba2d823f586246a853f15e9c56d 100644 (file)
--- a/libarchive/archive_read_support_format_zip.c
+++ b/libarchive/archive_read_support_format_zip.c
@@ -1726,7 +1726,7 @@ zipx_xz_init(struct archive_read *a, struct zip *zip)
        r = lzma_stream_decoder(&zip->zipx_lzma_stream, UINT64_MAX, 0);
        if (r != LZMA_OK) {
                archive_set_error(&(a->archive), ARCHIVE_ERRNO_MISC,
-                   "xz initialization failed(%d)",
+                   "xz initialization failed (%d)",
                    r);
 
                return (ARCHIVE_FAILED);
@@ -1778,7 +1778,7 @@ zipx_lzma_alone_init(struct archive_read *a, struct zip *zip)
        r = lzma_alone_decoder(&zip->zipx_lzma_stream, UINT64_MAX);
        if (r != LZMA_OK) {
                archive_set_error(&(a->archive), ARCHIVE_ERRNO_MISC,
-                   "lzma initialization failed(%d)", r);
+                   "lzma initialization failed (%d)", r);
 
                return (ARCHIVE_FAILED);
        }
@@ -2261,7 +2261,7 @@ zipx_bzip2_init(struct archive_read *a, struct zip *zip)
        r = BZ2_bzDecompressInit(&zip->bzstream, 0, 1);
        if(r != BZ_OK) {
                archive_set_error(&(a->archive), ARCHIVE_ERRNO_MISC,
-                   "bzip2 initialization failed(%d)",
+                   "bzip2 initialization failed (%d)",
                    r);
 
                return ARCHIVE_FAILED;
@@ -3193,7 +3193,7 @@ archive_read_format_zip_read_data(struct archive_read *a,
                    != (zip->entry_uncompressed_bytes_read & UINT32_MAX)) {
                        archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
                            "ZIP uncompressed data is wrong size "
-                           "(read %jd, expected %jd)\n",
+                           "(read %jd, expected %jd)",
                            (intmax_t)zip->entry_uncompressed_bytes_read,
                            (intmax_t)zip->entry->uncompressed_size);
                        return (ARCHIVE_FAILED);