From: Graham Percival Date: Wed, 30 Nov 2016 21:46:10 +0000 (-0800) Subject: Spelling fixes (#830) X-Git-Tag: v3.3.0~107 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa8dc4e93c45182de73cded86ebf58a348851f05;p=thirdparty%2Flibarchive.git Spelling fixes (#830) * Spelling: previos -> previous Sponsored by: Tarsnap Backup Inc. * Spelling: Preparre -> Prepare Sponsored by: Tarsnap Backup Inc. * Spelling: Invalide -> Invalid Sponsored by: Tarsnap Backup Inc. * Spelling: leagal -> legal Sponsored by: Tarsnap Backup Inc. * Spelling: lengthe -> length Sponsored by: Tarsnap Backup Inc. * Spelling: cotents -> contents Sponsored by: Tarsnap Backup Inc. * Spelling: travesal -> traversal Sponsored by: Tarsnap Backup Inc. * Spelling: functinos -> functions Sponsored by: Tarsnap Backup Inc. * Spelling: particluar -> particular Sponsored by: Tarsnap Backup Inc. * Spelling: uncapable -> incapable Sponsored by: Tarsnap Backup Inc. --- diff --git a/libarchive/archive.h b/libarchive/archive.h index ff401e94f..3a9369084 100644 --- a/libarchive/archive.h +++ b/libarchive/archive.h @@ -562,7 +562,7 @@ __LA_DECL la_int64_t archive_read_header_position(struct archive *); * we cannot say whether there are encrypted entries, then * ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW is returned. * In general, this function will return values below zero when the - * reader is uncertain or totally uncapable of encryption support. + * reader is uncertain or totally incapable of encryption support. * When this function returns 0 you can be sure that the reader * supports encryption detection but no encrypted entries have * been found yet. @@ -984,12 +984,12 @@ __LA_DECL int archive_read_disk_can_descend(struct archive *); __LA_DECL int archive_read_disk_current_filesystem(struct archive *); __LA_DECL int archive_read_disk_current_filesystem_is_synthetic(struct archive *); __LA_DECL int archive_read_disk_current_filesystem_is_remote(struct archive *); -/* Request that the access time of the entry visited by travesal be restored. */ +/* Request that the access time of the entry visited by traversal be restored. */ __LA_DECL int archive_read_disk_set_atime_restored(struct archive *); /* * Set behavior. The "flags" argument selects optional behavior. */ -/* Request that the access time of the entry visited by travesal be restored. +/* Request that the access time of the entry visited by traversal be restored. * This is the same as archive_read_disk_set_atime_restored. */ #define ARCHIVE_READDISK_RESTORE_ATIME (0x0001) /* Default: Do not skip an entry which has nodump flags. */ @@ -1124,7 +1124,7 @@ __LA_DECL int archive_match_time_excluded(struct archive *, /* * Flags to tell a matching type of time stamps. These are used for - * following functinos. + * following functions. */ /* Time flag: mtime to be tested. */ #define ARCHIVE_MATCH_MTIME (0x0100) @@ -1144,7 +1144,7 @@ __LA_DECL int archive_match_include_date(struct archive *, int _flag, const char *_datestr); __LA_DECL int archive_match_include_date_w(struct archive *, int _flag, const wchar_t *_datestr); -/* Set inclusion time by a particluar file. */ +/* Set inclusion time by a particular file. */ __LA_DECL int archive_match_include_file_time(struct archive *, int _flag, const char *_pathname); __LA_DECL int archive_match_include_file_time_w(struct archive *, diff --git a/tar/creation_set.c b/tar/creation_set.c index 87d561b35..24cf3fcdd 100644 --- a/tar/creation_set.c +++ b/tar/creation_set.c @@ -295,7 +295,7 @@ cset_auto_compress(struct creation_set *cset, const char *filename) struct filter_set *v; int i, r; - /* Release previos filters. */ + /* Release previous filters. */ _cleanup_filters(old_filters, old_filter_count); v = malloc(sizeof(*v) * cset->filter_count); @@ -308,7 +308,7 @@ cset_auto_compress(struct creation_set *cset, const char *filename) cset->filters = v; return (1); } else { - /* Put previos filters back. */ + /* Put previous filters back. */ cset->filters = old_filters; cset->filter_count = old_filter_count; return (0); diff --git a/tar/test/main.c b/tar/test/main.c index d35d33565..71a0c49e5 100644 --- a/tar/test/main.c +++ b/tar/test/main.c @@ -521,7 +521,7 @@ _utf8_to_unicode(uint32_t *pwc, const char *s, size_t n) return (0); /* Standard: return 0 for end-of-string. */ cnt = utf8_count[ch]; - /* Invalide sequence or there are not plenty bytes. */ + /* Invalid sequence or there are not plenty bytes. */ if (n < (size_t)cnt) return (-1); @@ -560,7 +560,7 @@ _utf8_to_unicode(uint32_t *pwc, const char *s, size_t n) return (-1); } - /* The code point larger than 0x10FFFF is not leagal + /* The code point larger than 0x10FFFF is not legal * Unicode values. */ if (wc > 0x10FFFF) return (-1); diff --git a/tar/test/test_copy.c b/tar/test/test_copy.c index c4c1aa057..e6e31f452 100644 --- a/tar/test/test_copy.c +++ b/tar/test/test_copy.c @@ -285,7 +285,7 @@ copy_basic(void) /* NOTE: for proper operation on cygwin-1.5 and windows, the * length of the name of the directory below, "plain", must be - * less than or equal to the lengthe of the name of the original + * less than or equal to the length of the name of the original * directory, "original" This restriction derives from the * extremely limited pathname lengths on those platforms. */ @@ -327,7 +327,7 @@ copy_ustar(void) /* NOTE: for proper operation on cygwin-1.5 and windows, the * length of the name of the directory below, "ustar", must be - * less than or equal to the lengthe of the name of the original + * less than or equal to the length of the name of the original * directory, "original" This restriction derives from the * extremely limited pathname lengths on those platforms. */ diff --git a/tar/test/test_windows.c b/tar/test/test_windows.c index 1977ec644..d619667bf 100644 --- a/tar/test/test_windows.c +++ b/tar/test/test_windows.c @@ -133,7 +133,7 @@ DEFINE_TEST(test_windows) char *fp1, *fp2; /* - * Preparre tests. + * Prepare tests. * Create directories and files. */ assertMakeDir("tmp", 0775); diff --git a/tar/write.c b/tar/write.c index da5a12825..7960487f9 100644 --- a/tar/write.c +++ b/tar/write.c @@ -527,7 +527,7 @@ write_archive(struct archive *a, struct bsdtar *bsdtar) struct archive *disk = bsdtar->diskreader; /* - * This tricky code here is to correctly read the cotents + * This tricky code here is to correctly read the contents * of the entry because the disk reader bsdtar->diskreader * is pointing at does not have any information about the * entry by this time and using archive_read_data_block()