From: Colin Percival Date: Tue, 16 Aug 2011 04:38:43 +0000 (-0400) Subject: Typos in comments: "a archive" -> "an archive", "formts" -> "formats", X-Git-Tag: v3.0.0a~128 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0b2ef61daa28fc8f0fc7892c3f0cd50c201e5bd;p=thirdparty%2Flibarchive.git Typos in comments: "a archive" -> "an archive", "formts" -> "formats", "noone" -> "no one", "we where" -> "we were", "ar_size filed" -> "ar_size field", "furtunately" -> "fortunately", "explicity" -> "explicitly", "noticably" -> "noticeably". Delete whitespace before a comma. archive_read_header is called archive_read_next_header. archive_entry_link_resolver_free is called archive_entry_linkresolver_free. Via: Tarsnap SVN-Revision: 3614 --- diff --git a/libarchive/archive.h b/libarchive/archive.h index 86b5ae621..d2cbaeddd 100644 --- a/libarchive/archive.h +++ b/libarchive/archive.h @@ -241,7 +241,7 @@ typedef int archive_close_callback(struct archive *, void *_client_data); * will change the format code to indicate the extended format that * was used). In other cases, it's because different tools have * modified the archive and so different parts of the archive - * actually have slightly different formts. (Both tar and cpio store + * actually have slightly different formats. (Both tar and cpio store * format codes in each entry, so it is quite possible for each * entry to be in a different format.) */ @@ -522,7 +522,7 @@ __LA_DECL int archive_read_finish(struct archive *); /*- * To create an archive: - * 1) Ask archive_write_new for a archive writer object. + * 1) Ask archive_write_new for an archive writer object. * 2) Set any global properties. In particular, you should set * the compression and format to use. * 3) Call archive_write_open to open the file (most people diff --git a/libarchive/archive_entry.h b/libarchive/archive_entry.h index 3866de3cc..d478626cd 100644 --- a/libarchive/archive_entry.h +++ b/libarchive/archive_entry.h @@ -543,7 +543,7 @@ __LA_DECL int archive_entry_sparse_next(struct archive_entry *, * be written. * 4. Call archive_entry_linkify(resolver, NULL) until * no more entries are returned. - * 5. Call archive_entry_link_resolver_free(resolver) to free resources. + * 5. Call archive_entry_linkresolver_free(resolver) to free resources. * * The entries returned have their hardlink and size fields updated * appropriately. If an entry is passed in that does not refer to @@ -593,7 +593,7 @@ struct archive_entry_linkresolver; * linkify(l2) => l1 * linkify(NULL) => l2 (at end, you retrieve remaining links) * As the name suggests, this strategy is used by newer cpio variants. - * It's noticably more complex for the archiver, slightly more complex + * It's noticeably more complex for the archiver, slightly more complex * for the dearchiver than the tar strategy, but makes it straightforward * to restore a file using any link by simply continuing to scan until * you see a link that is stored with a body. In contrast, the tar diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c index e03c3daff..b537af6c9 100644 --- a/libarchive/archive_read_support_format_iso9660.c +++ b/libarchive/archive_read_support_format_iso9660.c @@ -569,7 +569,7 @@ archive_read_format_iso9660_options(struct archive_read *a, /* Note: The "warn" return is just to inform the options * supervisor that we didn't handle it. It will generate - * a suitable error if noone used this option. */ + * a suitable error if no one used this option. */ return (ARCHIVE_WARN); } @@ -1889,7 +1889,7 @@ parse_file_info(struct archive_read *a, struct file_info *parent, /* trim trailing first version and dot from filename. * - * Remember we where in UTF-16BE land! + * Remember we were in UTF-16BE land! * SEPARATOR 1 (.) and SEPARATOR 2 (;) are both * 16 bits big endian characters on Joliet. * diff --git a/libarchive/archive_read_support_format_tar.c b/libarchive/archive_read_support_format_tar.c index afd33d30b..65fedff6e 100644 --- a/libarchive/archive_read_support_format_tar.c +++ b/libarchive/archive_read_support_format_tar.c @@ -412,7 +412,7 @@ tar_flush_unconsumed(struct archive_read *a, size_t *unconsumed) } /* - * The function invoked by archive_read_header(). This + * The function invoked by archive_read_next_header(). This * just sets up a few things and then calls the internal * tar_read_header() function below. */ @@ -2168,7 +2168,7 @@ gnu_sparse_old_parse(struct archive_read *a, struct tar *tar, * Beginning with GNU tar 1.15, sparse files are stored using * information in the pax extended header. The GNU tar maintainers * have gone through a number of variations in the process of working - * out this scheme; furtunately, they're all numbered. + * out this scheme; fortunately, they're all numbered. * * Sparse format 0.0 uses attribute GNU.sparse.numblocks to store the * number of blocks, and GNU.sparse.offset/GNU.sparse.numbytes to diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c index caf4fd8cf..4aaa7d10d 100644 --- a/libarchive/archive_write.c +++ b/libarchive/archive_write.c @@ -29,7 +29,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_write.c 201099 2009-12-28 03:03: /* * This file contains the "essential" portions of the write API, that * is, stuff that will essentially always be used by any client that - * actually needs to write a archive. Optional pieces have been, as + * actually needs to write an archive. Optional pieces have been, as * far as possible, separated out into separate files to reduce * needlessly bloating statically-linked clients. */ diff --git a/libarchive/archive_write_set_format_ar.c b/libarchive/archive_write_set_format_ar.c index 715f1d1de..956b93228 100644 --- a/libarchive/archive_write_set_format_ar.c +++ b/libarchive/archive_write_set_format_ar.c @@ -201,7 +201,7 @@ archive_write_ar_header(struct archive_write *a, struct archive_entry *entry) ar->is_strtab = 1; buff[AR_name_offset] = buff[AR_name_offset + 1] = '/'; /* - * For archive string table, only ar_size filed should + * For archive string table, only ar_size field should * be set. */ goto size; @@ -515,7 +515,7 @@ format_decimal(int64_t v, char *p, int s) len = s; h = p; - /* Negative values in ar header are meaningless , so use 0. */ + /* Negative values in ar header are meaningless, so use 0. */ if (v < 0) { while (len-- > 0) *p++ = '0'; diff --git a/libarchive/archive_write_set_format_ustar.c b/libarchive/archive_write_set_format_ustar.c index 6e36c8fd3..4b96ac23c 100644 --- a/libarchive/archive_write_set_format_ustar.c +++ b/libarchive/archive_write_set_format_ustar.c @@ -371,7 +371,7 @@ __archive_write_format_header_ustar(struct archive_write *a, char h[512], * The only feasible separator is a final '/'; * this would result in a non-empty prefix and * an empty name, which POSIX doesn't - * explicity forbid, but it just feels wrong. + * explicitly forbid, but it just feels wrong. */ archive_set_error(&a->archive, ENAMETOOLONG, "Pathname too long");