Fix a couple of typographical errors.

diff --git a/libarchive/archive_match.c b/libarchive/archive_match.c
index 4c41badf1f86c26c961717cc18189c9688178e2b..0719cbd54736cf3f1b60737376dd85cdb313962a 100644 (file)
--- a/libarchive/archive_match.c
+++ b/libarchive/archive_match.c
@@ -655,7 +655,7 @@ add_pattern_from_file(struct archive_match *a, struct match_list *mlist,
                }
        }
 
-       /* If something error happend, report it immediately. */ 
+       /* If an error occurred, report it immediately. */
        if (r < ARCHIVE_OK) {
                archive_copy_error(&(a->archive), ar);
                archive_read_free(ar);

diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c
index f54cda69c125fda4f8f6c2177892a5331055fcfd..5901a879c4973c9870363e7354da423193ef5313 100644 (file)
--- a/libarchive/archive_read_disk_posix.c
+++ b/libarchive/archive_read_disk_posix.c
@@ -938,7 +938,7 @@ next_entry(struct archive_read_disk *a, struct tree *t,
                r = archive_match_path_excluded(a->matching, entry);
                if (r < 0) {
                        archive_set_error(&(a->archive), errno,
-                           "Faild : %s", archive_error_string(a->matching));
+                           "Failed : %s", archive_error_string(a->matching));
                        return (r);
                }
                if (r) {
@@ -1041,7 +1041,7 @@ next_entry(struct archive_read_disk *a, struct tree *t,
                r = archive_match_time_excluded(a->matching, entry);
                if (r < 0) {
                        archive_set_error(&(a->archive), errno,
-                           "Faild : %s", archive_error_string(a->matching));
+                           "Failed : %s", archive_error_string(a->matching));
                        return (r);
                }
                if (r) {
@@ -1067,7 +1067,7 @@ next_entry(struct archive_read_disk *a, struct tree *t,
                r = archive_match_owner_excluded(a->matching, entry);
                if (r < 0) {
                        archive_set_error(&(a->archive), errno,
-                           "Faild : %s", archive_error_string(a->matching));
+                           "Failed : %s", archive_error_string(a->matching));
                        return (r);
                }
                if (r) {

diff --git a/libarchive/archive_read_disk_windows.c b/libarchive/archive_read_disk_windows.c
index 566d264e9a410f9cbf338d5ce0f212de2da2e73b..1fd158ffd5f452135881e269195994e1c894650e 100644 (file)
--- a/libarchive/archive_read_disk_windows.c
+++ b/libarchive/archive_read_disk_windows.c
@@ -803,7 +803,7 @@ next_entry(struct archive_read_disk *a, struct tree *t,
                r = archive_match_path_excluded(a->matching, entry);
                if (r < 0) {
                        archive_set_error(&(a->archive), errno,
-                           "Faild : %s", archive_error_string(a->matching));
+                           "Failed : %s", archive_error_string(a->matching));
                        return (r);
                }
                if (r) {
@@ -875,7 +875,7 @@ next_entry(struct archive_read_disk *a, struct tree *t,
                r = archive_match_time_excluded(a->matching, entry);
                if (r < 0) {
                        archive_set_error(&(a->archive), errno,
-                           "Faild : %s", archive_error_string(a->matching));
+                           "Failed : %s", archive_error_string(a->matching));
                        return (r);
                }
                if (r) {
@@ -901,7 +901,7 @@ next_entry(struct archive_read_disk *a, struct tree *t,
                r = archive_match_owner_excluded(a->matching, entry);
                if (r < 0) {
                        archive_set_error(&(a->archive), errno,
-                           "Faild : %s", archive_error_string(a->matching));
+                           "Failed : %s", archive_error_string(a->matching));
                        return (r);
                }
                if (r) {

diff --git a/libarchive/archive_read_support_filter_lz4.c b/libarchive/archive_read_support_filter_lz4.c
index e877917b940b697c00f5ebd5593314d3a55942fa..37b2f59004b1bd23bd684b29faa61f820f83469e 100644 (file)
--- a/libarchive/archive_read_support_filter_lz4.c
+++ b/libarchive/archive_read_support_filter_lz4.c
@@ -595,7 +595,7 @@ lz4_filter_read_data_block(struct archive_read_filter *self, const void **p)
 #endif
        }
 
-       /* Check if an error happend in decompression process. */
+       /* Check if an error occurred in the decompression process. */
        if (uncompressed_size < 0) {
                archive_set_error(&(self->archive->archive),
                    ARCHIVE_ERRNO_MISC, "lz4 decompression failed");

diff --git a/libarchive/archive_read_support_format_warc.c b/libarchive/archive_read_support_format_warc.c
index 9d80132875684d801066188f73eb8072ff0ccbd4..deeaa9e6d93df1a19c684da648df03b66c5eb5d2 100644 (file)
--- a/libarchive/archive_read_support_format_warc.c
+++ b/libarchive/archive_read_support_format_warc.c
@@ -318,7 +318,7 @@ start_over:
                }
                memcpy(w->pool.str, fnam.str, fnam.len);
                w->pool.str[fnam.len] = '\0';
-               /* let noone else know about the pool, it's a secret, shhh */
+               /* let no one else know about the pool, it's a secret, shhh */
                fnam.str = w->pool.str;
 
                /* snarf mtime or deduce from rtime

diff --git a/libarchive/archive_util.c b/libarchive/archive_util.c
index cc3d1c460728ff21da39ac25be1fe45b0ccb05aa..6b3bd61163d9a4794350986e04e1fc2af1269c85 100644 (file)
--- a/libarchive/archive_util.c
+++ b/libarchive/archive_util.c
@@ -580,7 +580,7 @@ void
 __archive_ensure_cloexec_flag(int fd)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
-       (void)fd; /* UNSED */
+       (void)fd; /* UNUSED */
 #else
        int flags;
 

diff --git a/libarchive/archive_write_set_format_iso9660.c b/libarchive/archive_write_set_format_iso9660.c
index cb3e54e8d21b10ece9a241f638c63ccbcec358b6..c20e0885236eff6cbd388beb6fa5b218c5e9b267 100644 (file)
--- a/libarchive/archive_write_set_format_iso9660.c
+++ b/libarchive/archive_write_set_format_iso9660.c
@@ -436,7 +436,7 @@ struct iso_option {
         * Type   : string
         * Default: Auto detect
         *        : We check a size of boot image;
-        *        : If ths size is just 1.22M/1.44M/2.88M,
+        *        : If the size is just 1.22M/1.44M/2.88M,
         *        : we assume boot_type is 'fd';
         *        : otherwise boot_type is 'no-emulation'.
         * COMPAT :

diff --git a/libarchive/test/test_read_format_rar.c b/libarchive/test/test_read_format_rar.c
index 587032309c47537569a14ac0693f9e0bdc07d219..6392d8f50ff801c65cba5d222dac34a49eb560bb 100644 (file)
--- a/libarchive/test/test_read_format_rar.c
+++ b/libarchive/test/test_read_format_rar.c
@@ -3603,7 +3603,7 @@ DEFINE_TEST(test_read_format_rar_multivolume_uncompressed_files)
   assertEqualIntA(a, 0, archive_read_data(a, buff, sizeof(buff)));
 
   /*
-   * Eigth header.
+   * Eighth header.
    */
   assertA(0 == archive_read_next_header(a, &ae));
   assertEqualString("testdir/testsymlink6", archive_entry_pathname(ae));