Spelling fixes

Sponsored by:	Tarsnap Backup Inc.

diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c
index 157f47202172516d55507c044ac448b3613da01c..bb2b7f9f1f92af6b301e80a9f4b178dad5ffeef5 100644 (file)
--- a/libarchive/archive_read_disk_posix.c
+++ b/libarchive/archive_read_disk_posix.c
@@ -1382,7 +1382,7 @@ update_current_filesystem(struct archive_read_disk *a, int64_t dev)
 
        for (i = 0; i < t->max_filesystem_id; i++) {
                if (t->filesystem_table[i].dev == dev) {
-                       /* There is the filesytem ID we've already generated. */
+                       /* There is the filesystem ID we've already generated. */
                        t->current_filesystem_id = i;
                        t->current_filesystem = &(t->filesystem_table[i]);
                        return (ARCHIVE_OK);
@@ -1390,7 +1390,7 @@ update_current_filesystem(struct archive_read_disk *a, int64_t dev)
        }
 
        /*
-        * This is the new filesytem which we have to generate a new ID for.
+        * This is the new filesystem which we have to generate a new ID for.
         */
        fid = t->max_filesystem_id++;
        if (t->max_filesystem_id > t->allocated_filesytem) {

diff --git a/libarchive/archive_read_disk_windows.c b/libarchive/archive_read_disk_windows.c
index 287f74c2da3d736319eed65481bad2a01dc6f390..0532afa495377c596033f2cdfccfb04e422a5939 100644 (file)
--- a/libarchive/archive_read_disk_windows.c
+++ b/libarchive/archive_read_disk_windows.c
@@ -1260,7 +1260,7 @@ update_current_filesystem(struct archive_read_disk *a, int64_t dev)
 
        for (i = 0; i < t->max_filesystem_id; i++) {
                if (t->filesystem_table[i].dev == dev) {
-                       /* There is the filesytem ID we've already generated. */
+                       /* There is the filesystem ID we've already generated. */
                        t->current_filesystem_id = i;
                        t->current_filesystem = &(t->filesystem_table[i]);
                        return (ARCHIVE_OK);
@@ -1268,7 +1268,7 @@ update_current_filesystem(struct archive_read_disk *a, int64_t dev)
        }
 
        /*
-        * There is a new filesytem, we generate a new ID for.
+        * There is a new filesystem, we generate a new ID for.
         */
        fid = t->max_filesystem_id++;
        if (t->max_filesystem_id > t->allocated_filesytem) {

diff --git a/libarchive/archive_read_support_format_7zip.c b/libarchive/archive_read_support_format_7zip.c
index c0a536c4a981cae29c19d508acc281c3d02b8835..268daa20106b1f1ee9dfbd06aff366c514db29f4 100644 (file)
--- a/libarchive/archive_read_support_format_7zip.c
+++ b/libarchive/archive_read_support_format_7zip.c
@@ -213,7 +213,7 @@ struct _7zip {
        int                      header_is_encoded;
        uint64_t                 header_bytes_remaining;
        unsigned long            header_crc32;
-       /* Header offset to check that reading pointes of the file contens
+       /* Header offset to check that reading points of the file contents
         * will not exceed the header. */
        uint64_t                 header_offset;
        /* Base offset of the archive file for a seek in case reading SFX. */

diff --git a/libarchive/archive_read_support_format_cpio.c b/libarchive/archive_read_support_format_cpio.c
index b09db0e9a59b2be4d04c8c318f45ca7d16963285..7438babb60d15ef2cbffdfa965a4ed593790fff7 100644 (file)
--- a/libarchive/archive_read_support_format_cpio.c
+++ b/libarchive/archive_read_support_format_cpio.c
@@ -814,8 +814,8 @@ header_odc(struct archive_read *a, struct cpio *cpio,
  * NOTE: if a filename suffix is ".z", it is the file gziped by afio.
  * it would be nice that we can show uncompressed file size and we can
  * uncompressed file contents automatically, unfortunately we have nothing
- * to get a uncompressed file size while reading each header. it means
- * we also cannot uncompressed file contens under the our framework.
+ * to get a uncompressed file size while reading each header. It means
+ * we also cannot uncompress file contents under our framework.
  */
 static int
 header_afiol(struct archive_read *a, struct cpio *cpio,

diff --git a/libarchive/archive_read_support_format_tar.c b/libarchive/archive_read_support_format_tar.c
index e572bbde00b1fd32b6bb1ea3b4bbf486264d989c..948929a3d8179f052060f30e2acfd822611251fc 100644 (file)
--- a/libarchive/archive_read_support_format_tar.c
+++ b/libarchive/archive_read_support_format_tar.c
@@ -297,7 +297,7 @@ archive_read_format_tar_cleanup(struct archive_read *a)
 /*
  * Validate number field
  *
- * This has to be pretty lenient in order to accomodate the enormous
+ * This has to be pretty lenient in order to accommodate the enormous
  * variety of tar writers in the world:
  *  = POSIX (IEEE Std 1003.1-1988) ustar requires octal values with leading
  *    zeros and allows fields to be terminated with space or null characters
@@ -423,7 +423,7 @@ archive_read_format_tar_options(struct archive_read *a,
 
        tar = (struct tar *)(a->format->data);
        if (strcmp(key, "compat-2x")  == 0) {
-               /* Handle UTF-8 filnames as libarchive 2.x */
+               /* Handle UTF-8 filenames as libarchive 2.x */
                tar->compat_2x = (val != NULL && val[0] != 0);
                tar->init_default_conversion = tar->compat_2x;
                return (ARCHIVE_OK);
@@ -2542,7 +2542,7 @@ tar_atol_base_n(const char *p, size_t char_cnt, int base)
        last_digit_limit = INT64_MAX % base;
 
        /* the pointer will not be dereferenced if char_cnt is zero
-        * due to the way the && operator is evaulated.
+        * due to the way the && operator is evaluated.
         */
        while (char_cnt != 0 && (*p == ' ' || *p == '\t')) {
                p++;

diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
index 727b9e886d3f82a297bd466148e70b93cbc489e1..aa57f01549f57cb3842bc842440e8526927d5492 100644 (file)
--- a/libarchive/archive_string.c
+++ b/libarchive/archive_string.c
@@ -1992,7 +1992,7 @@ archive_strncat_l(struct archive_string *as, const void *_p, size_t n,
 #if HAVE_ICONV
 
 /*
- * Return -1 if conversion failes.
+ * Return -1 if conversion fails.
  */
 static int
 iconv_strncat_in_locale(struct archive_string *as, const void *_p,
@@ -2094,7 +2094,7 @@ iconv_strncat_in_locale(struct archive_string *as, const void *_p,
 
 /*
  * Translate a string from a some CodePage to an another CodePage by
- * Windows APIs, and copy the result. Return -1 if conversion failes.
+ * Windows APIs, and copy the result. Return -1 if conversion fails.
  */
 static int
 strncat_in_codepage(struct archive_string *as,
@@ -3474,7 +3474,7 @@ strncat_from_utf8_libarchive2(struct archive_string *as,
 
 /*
  * Convert a UTF-16BE/LE string to current locale and copy the result.
- * Return -1 if conversion failes.
+ * Return -1 if conversion fails.
  */
 static int
 win_strncat_from_utf16(struct archive_string *as, const void *_p, size_t bytes,
@@ -3598,7 +3598,7 @@ is_big_endian(void)
 
 /*
  * Convert a current locale string to UTF-16BE/LE and copy the result.
- * Return -1 if conversion failes.
+ * Return -1 if conversion fails.
  */
 static int
 win_strncat_to_utf16(struct archive_string *as16, const void *_p,
@@ -3703,7 +3703,7 @@ win_strncat_to_utf16le(struct archive_string *as16, const void *_p,
 
 /*
  * Convert a UTF-16BE string to current locale and copy the result.
- * Return -1 if conversion failes.
+ * Return -1 if conversion fails.
  */
 static int
 best_effort_strncat_from_utf16(struct archive_string *as, const void *_p,
@@ -3761,7 +3761,7 @@ best_effort_strncat_from_utf16le(struct archive_string *as, const void *_p,
 
 /*
  * Convert a current locale string to UTF-16BE/LE and copy the result.
- * Return -1 if conversion failes.
+ * Return -1 if conversion fails.
  */
 static int
 best_effort_strncat_to_utf16(struct archive_string *as16, const void *_p,

diff --git a/libarchive/archive_write_add_filter_lz4.c b/libarchive/archive_write_add_filter_lz4.c
index 1d0ab8c56a16dc7cc673fa73c6c19ab16521b62f..e6551859c0609cd46dc109f339a9d6894c0cf50e 100644 (file)
--- a/libarchive/archive_write_add_filter_lz4.c
+++ b/libarchive/archive_write_add_filter_lz4.c
@@ -523,7 +523,7 @@ drive_compressor_independence(struct archive_write_filter *f, const char *p,
                archive_le32enc(data->out, outsize);
                data->out += 4;
        } else {
-               /* The buffer is not compressed. The commpressed size was
+               /* The buffer is not compressed. The compressed size was
                 * bigger than its uncompressed size. */
                archive_le32enc(data->out, length | 0x80000000);
                data->out += 4;
@@ -608,7 +608,7 @@ drive_compressor_dependence(struct archive_write_filter *f, const char *p,
                archive_le32enc(data->out, outsize);
                data->out += 4;
        } else {
-               /* The buffer is not compressed. The commpressed size was
+               /* The buffer is not compressed. The compressed size was
                 * bigger than its uncompressed size. */
                archive_le32enc(data->out, length | 0x80000000);
                data->out += 4;

diff --git a/libarchive/archive_write_set_format_iso9660.c b/libarchive/archive_write_set_format_iso9660.c
index c20e0885236eff6cbd388beb6fa5b218c5e9b267..591105e65b0e7d18ca18cd0523c542654d077b50 100644 (file)
--- a/libarchive/archive_write_set_format_iso9660.c
+++ b/libarchive/archive_write_set_format_iso9660.c
@@ -3024,8 +3024,8 @@ set_directory_record_rr(unsigned char *bp, int dr_len,
                 *    +----+----+----+----+----+
                 *   10   11   12   13   14   15
                 *
-                *    - cflg : flag of componet
-                *    - clen : length of componet
+                *    - cflg : flag of component
+                *    - clen : length of component
                 */
                const char *sl;
                char sl_last;

diff --git a/libarchive/archive_write_set_format_xar.c b/libarchive/archive_write_set_format_xar.c
index a2dbc03991df9185f5599f044a6969c9964ce6f2..da6daac4ff245d58726c7938e4caafb80e89b262 100644 (file)
--- a/libarchive/archive_write_set_format_xar.c
+++ b/libarchive/archive_write_set_format_xar.c
@@ -192,7 +192,7 @@ struct file {
        struct file             *parent;        /* parent directory entry */
        /*
         * To manage sub directory files.
-        * We use 'chnext' a menber of struct file to chain.
+        * We use 'chnext' (a member of struct file) to chain.
         */
        struct {
                struct file     *first;
@@ -258,7 +258,7 @@ struct xar {
        /*
         * The list of all file entries is used to manage struct file
         * objects.
-        * We use 'next' a menber of struct file to chain.
+        * We use 'next' (a member of struct file) to chain.
         */
        struct {
                struct file     *first;
@@ -266,7 +266,7 @@ struct xar {
        }                        file_list;
        /*
         * The list of hard-linked file entries.
-        * We use 'hlnext' a menber of struct file to chain.
+        * We use 'hlnext' (a member of struct file) to chain.
         */
        struct archive_rb_tree   hardlink_rbtree;
 };

diff --git a/libarchive/test/test_archive_read_add_passphrase.c b/libarchive/test/test_archive_read_add_passphrase.c
index 45f826d17707b6059bfc9d110711dcd4cea6feb6..68dec10d9a12db94fa85619279b0df5d434f7356 100644 (file)
--- a/libarchive/test/test_archive_read_add_passphrase.c
+++ b/libarchive/test/test_archive_read_add_passphrase.c
@@ -80,7 +80,7 @@ DEFINE_TEST(test_archive_read_add_passphrase_single)
        __archive_read_reset_passphrase(ar);
        /* Fist call, we should get "pass1" as a passphrase. */
        assertEqualString("pass1", __archive_read_next_passphrase(ar));
-       /* Second call, we should get NULL which means all the pssphrases
+       /* Second call, we should get NULL which means all the passphrases
         * are passed already. */
        assertEqualString(NULL, __archive_read_next_passphrase(ar));
 
@@ -100,7 +100,7 @@ DEFINE_TEST(test_archive_read_add_passphrase_multiple)
        assertEqualString("pass1", __archive_read_next_passphrase(ar));
        /* Second call, we should get "pass2" as a passphrase. */
        assertEqualString("pass2", __archive_read_next_passphrase(ar));
-       /* Third call, we should get NULL which means all the pssphrases
+       /* Third call, we should get NULL which means all the passphrases
         * are passed already. */
        assertEqualString(NULL, __archive_read_next_passphrase(ar));
 
@@ -171,7 +171,7 @@ DEFINE_TEST(test_archive_read_add_passphrase_set_callback2)
        __archive_read_reset_passphrase(ar);
        /* Fist call, we should get "passCallBack" as a passphrase. */
        assertEqualString("passCallBack", __archive_read_next_passphrase(ar));
-       /* Second call, we should get NULL which means all the pssphrases
+       /* Second call, we should get NULL which means all the passphrases
         * are passed already. */
        assertEqualString(NULL, __archive_read_next_passphrase(ar));
 
@@ -193,7 +193,7 @@ DEFINE_TEST(test_archive_read_add_passphrase_set_callback3)
        __archive_read_reset_passphrase(ar);
        /* After reset passphrase, we should get "passCallBack"passphrase. */
        assertEqualString("passCallBack", __archive_read_next_passphrase(ar));
-       /* Second call, we should get NULL which means all the pssphrases
+       /* Second call, we should get NULL which means all the passphrases
         * are passed already. */
        assertEqualString(NULL, __archive_read_next_passphrase(ar));
 
@@ -218,7 +218,7 @@ DEFINE_TEST(test_archive_read_add_passphrase_multiple_with_callback)
        assertEqualString("pass2", __archive_read_next_passphrase(ar));
        /* Third call, we should get "passCallBack" as a passphrase. */
        assertEqualString("passCallBack", __archive_read_next_passphrase(ar));
-       /* Fourth call, we should get NULL which means all the pssphrases
+       /* Fourth call, we should get NULL which means all the passphrases
         * are passed already. */
        assertEqualString(NULL, __archive_read_next_passphrase(ar));
 
@@ -251,7 +251,7 @@ DEFINE_TEST(test_archive_read_add_passphrase_multiple_with_callback2)
        assertEqualString("pass1", __archive_read_next_passphrase(ar));
        /* Third call, we should get "passCallBack" as a passphrase. */
        assertEqualString("pass2", __archive_read_next_passphrase(ar));
-       /* Fourth call, we should get NULL which means all the pssphrases
+       /* Fourth call, we should get NULL which means all the passphrases
         * are passed already. */
        assertEqualString(NULL, __archive_read_next_passphrase(ar));
 

diff --git a/libarchive/test/test_pax_filename_encoding.c b/libarchive/test/test_pax_filename_encoding.c
index 2d4515e1b3c4b979c4c76aef16771682892832d8..2fb7f452d54fdbe5dc57f01452cd1497c08d1d8c 100644 (file)
--- a/libarchive/test/test_pax_filename_encoding.c
+++ b/libarchive/test/test_pax_filename_encoding.c
@@ -347,7 +347,7 @@ DEFINE_TEST(test_pax_filename_encoding_KOI8R)
                return;
        }
 
-       /* Check if the paltform completely supports the string conversion. */
+       /* Check if the platform completely supports the string conversion. */
        a = archive_write_new();
        assertEqualInt(ARCHIVE_OK, archive_write_set_format_pax(a));
        if (archive_write_set_options(a, "hdrcharset=UTF-8") != ARCHIVE_OK) {
@@ -394,7 +394,7 @@ DEFINE_TEST(test_pax_filename_encoding_CP1251)
                return;
        }
 
-       /* Check if the paltform completely supports the string conversion. */
+       /* Check if the platform completely supports the string conversion. */
        a = archive_write_new();
        assertEqualInt(ARCHIVE_OK, archive_write_set_format_pax(a));
        if (archive_write_set_options(a, "hdrcharset=UTF-8") != ARCHIVE_OK) {
@@ -440,7 +440,7 @@ DEFINE_TEST(test_pax_filename_encoding_EUCJP)
                return;
        }
 
-       /* Check if the paltform completely supports the string conversion. */
+       /* Check if the platform completely supports the string conversion. */
        a = archive_write_new();
        assertEqualInt(ARCHIVE_OK, archive_write_set_format_pax(a));
        if (archive_write_set_options(a, "hdrcharset=UTF-8") != ARCHIVE_OK) {
@@ -488,7 +488,7 @@ DEFINE_TEST(test_pax_filename_encoding_CP932)
                return;
        }
 
-       /* Check if the paltform completely supports the string conversion. */
+       /* Check if the platform completely supports the string conversion. */
        a = archive_write_new();
        assertEqualInt(ARCHIVE_OK, archive_write_set_format_pax(a));
        if (archive_write_set_options(a, "hdrcharset=UTF-8") != ARCHIVE_OK) {

diff --git a/libarchive/test/test_read_disk_directory_traversals.c b/libarchive/test/test_read_disk_directory_traversals.c
index c16b0c65311ae59315576fa9602c4b2fbd6fa696..fefffd12dce45c3f513c30229e4cf126fd47257a 100644 (file)
--- a/libarchive/test/test_read_disk_directory_traversals.c
+++ b/libarchive/test/test_read_disk_directory_traversals.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
 #endif
 
 /*
- * Test if the current filesytem is mounted with noatime option.
+ * Test if the current filesystem is mounted with noatime option.
  */
 static int
 atimeIsUpdated(void)