From a80614384e97b994914e657be4c28326b5791e55 Mon Sep 17 00:00:00 2001 From: Samanta Navarro Date: Tue, 1 Jun 2021 11:26:02 +0000 Subject: [PATCH] Fix typos Typos found with codespell --- CMakeLists.txt | 6 +++--- build/utils/gen_archive_string_composition_h.sh | 2 +- contrib/libarchive.spec | 2 +- contrib/shar/shar.c | 2 +- libarchive/archive_read_support_filter_rpm.c | 2 +- libarchive/archive_read_support_filter_uu.c | 2 +- libarchive/archive_read_support_format_7zip.c | 2 +- libarchive/archive_read_support_format_mtree.c | 2 +- libarchive/cpio.5 | 2 +- libarchive/test/test_compat_lzma.c | 2 +- libarchive/test/test_write_disk_appledouble.c | 8 ++++---- libarchive/test/test_write_disk_hfs_compression.c | 8 ++++---- libarchive/test/test_write_disk_mac_metadata.c | 8 ++++---- libarchive/test/test_write_disk_no_hfs_compression.c | 8 ++++---- tar/test/test_option_safe_writes.c | 2 +- 15 files changed, 29 insertions(+), 29 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 95537fe87..d6b9b2f96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,7 +77,7 @@ math(EXPR INTERFACE_VERSION "13 + ${_minor}") # ?? Should there be more here ?? SET(SOVERSION "${INTERFACE_VERSION}") -# Enalbe CMAKE_PUSH_CHECK_STATE() and CMAKE_POP_CHECK_STATE() macros +# Enable CMAKE_PUSH_CHECK_STATE() and CMAKE_POP_CHECK_STATE() macros # saving and restoring the state of the variables. INCLUDE(CMakePushCheckState) @@ -378,7 +378,7 @@ IF(WIN32 AND NOT CMAKE_CL_64 AND NOT CYGWIN) SET(__GNUWIN32PATH "C:/Program Files/GnuWin32") ENDIF(WIN32 AND NOT CMAKE_CL_64 AND NOT CYGWIN) IF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}") - # You have to add a path availabel DLL file into PATH environment variable. + # You have to add a path available DLL file into PATH environment variable. # Maybe DLL path is "C:/Program Files/GnuWin32/bin". # The zlib and the bzip2 Setup program have installed programs and DLLs into # "C:/Program Files/GnuWin32" by default. @@ -1015,7 +1015,7 @@ MACRO(CHECK_ICONV LIB TRY_ICONV_CONST) CMAKE_C_COMPILER_ID MATCHES "^Clang$") # # During checking iconv proto type, we should use -Werror to avoid the - # success of iconv detection with a warnig which success is a miss + # success of iconv detection with a warning which success is a miss # detection. So this needs for all build mode(even it's a release mode). # SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror") diff --git a/build/utils/gen_archive_string_composition_h.sh b/build/utils/gen_archive_string_composition_h.sh index 925de5c85..558e9c0c7 100755 --- a/build/utils/gen_archive_string_composition_h.sh +++ b/build/utils/gen_archive_string_composition_h.sh @@ -246,7 +246,7 @@ function hextoi(hex) # Exclusion code points specified by # http://unicode.org/Public/6.0.0/ucd/CompositionExclusions.txt ## -# 1. Script Specifices +# 1. Script Specifics ## \$1 ~/^095[89ABCDEF]\$/ { next diff --git a/contrib/libarchive.spec b/contrib/libarchive.spec index 6ef8957f1..371ae647f 100644 --- a/contrib/libarchive.spec +++ b/contrib/libarchive.spec @@ -99,7 +99,7 @@ replace () print \".Dt ${binary^^} 1\"; next; } - # replace the first occurence of \"$pattern\" by \"$binary\" + # replace the first occurrence of \"$pattern\" by \"$binary\" !stop && /^.Nm $pattern/ { print \".Nm $binary\" ; stop = 1 ; diff --git a/contrib/shar/shar.c b/contrib/shar/shar.c index 6d5c206e2..63161fc9e 100644 --- a/contrib/shar/shar.c +++ b/contrib/shar/shar.c @@ -170,7 +170,7 @@ out: } /* - * Write singe path to the archive. The path can be a regular file, directory + * Write single path to the archive. The path can be a regular file, directory * or device. Symbolic links are followed. */ static int diff --git a/libarchive/archive_read_support_filter_rpm.c b/libarchive/archive_read_support_filter_rpm.c index e7e58e51f..ddd68392f 100644 --- a/libarchive/archive_read_support_filter_rpm.c +++ b/libarchive/archive_read_support_filter_rpm.c @@ -216,7 +216,7 @@ rpm_filter_read(struct archive_read_filter *self, const void **buff) archive_set_error( &self->archive->archive, ARCHIVE_ERRNO_FILE_FORMAT, - "Unrecoginized rpm header"); + "Unrecognized rpm header"); return (ARCHIVE_FATAL); } rpm->state = ST_ARCHIVE; diff --git a/libarchive/archive_read_support_filter_uu.c b/libarchive/archive_read_support_filter_uu.c index 67ddffb06..689c18ce4 100644 --- a/libarchive/archive_read_support_filter_uu.c +++ b/libarchive/archive_read_support_filter_uu.c @@ -248,7 +248,7 @@ bid_get_line(struct archive_read_filter *filter, *ravail = *avail; *b += diff; *avail -= diff; - tested = len;/* Skip some bytes we already determinated. */ + tested = len;/* Skip some bytes we already determined. */ len = get_line(*b + tested, *avail - tested, nl); if (len >= 0) len += tested; diff --git a/libarchive/archive_read_support_format_7zip.c b/libarchive/archive_read_support_format_7zip.c index f98566a35..63cbb7df3 100644 --- a/libarchive/archive_read_support_format_7zip.c +++ b/libarchive/archive_read_support_format_7zip.c @@ -1497,7 +1497,7 @@ decompress(struct archive_read *a, struct _7zip *zip, zip->ppmd7_stat = -1; archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Failed to initialize PPMd range decorder"); + "Failed to initialize PPMd range decoder"); return (ARCHIVE_FAILED); } if (zip->ppstream.overconsumed) { diff --git a/libarchive/archive_read_support_format_mtree.c b/libarchive/archive_read_support_format_mtree.c index c5ce01853..cef2c5c4b 100644 --- a/libarchive/archive_read_support_format_mtree.c +++ b/libarchive/archive_read_support_format_mtree.c @@ -408,7 +408,7 @@ next_line(struct archive_read *a, *ravail = *avail; *b += diff; *avail -= diff; - tested = len;/* Skip some bytes we already determinated. */ + tested = len;/* Skip some bytes we already determined. */ len = get_line_size(*b + len, *avail - len, nl); if (len >= 0) len += tested; diff --git a/libarchive/cpio.5 b/libarchive/cpio.5 index 9fb9b06b8..837a45692 100644 --- a/libarchive/cpio.5 +++ b/libarchive/cpio.5 @@ -186,7 +186,7 @@ in the struct, were accessed using a macro that byte swapped them if necessary. .Pp Next, 7th Edition had more file types to store, and the IALLOC and ILARG -flag bits were re-purposed to accomodate these. The revised use of the +flag bits were re-purposed to accommodate these. The revised use of the various bits is as follows: .Pp .Bl -tag -width "MMMMMMM" -compact diff --git a/libarchive/test/test_compat_lzma.c b/libarchive/test/test_compat_lzma.c index 86a2665b3..7e6e3a89f 100644 --- a/libarchive/test/test_compat_lzma.c +++ b/libarchive/test/test_compat_lzma.c @@ -141,7 +141,7 @@ compat_lzma(const char *name) DEFINE_TEST(test_compat_lzma) { - /* This sample has been added junk datas to its tail. */ + /* This sample has been added junk data to its tail. */ compat_lzma("test_compat_lzma_1.tlz"); /* This sample has been made by lzma with option -e, * the first byte of which is 0x5e. diff --git a/libarchive/test/test_write_disk_appledouble.c b/libarchive/test/test_write_disk_appledouble.c index 706794ab9..d82d698eb 100644 --- a/libarchive/test/test_write_disk_appledouble.c +++ b/libarchive/test/test_write_disk_appledouble.c @@ -67,7 +67,7 @@ has_xattr(const char *filename, const char *xattrname) { char *nl, *nlp; ssize_t r; - int exisiting; + int existing; r = listxattr(filename, NULL, 0, XATTR_SHOWCOMPRESSION); if (r < 0) @@ -85,15 +85,15 @@ has_xattr(const char *filename, const char *xattrname) return (0); } - exisiting = 0; + existing = 0; for (nlp = nl; nlp < nl + r; nlp += strlen(nlp) + 1) { if (strcmp(nlp, xattrname) == 0) { - exisiting = 1; + existing = 1; break; } } free(nl); - return (exisiting); + return (existing); } #endif diff --git a/libarchive/test/test_write_disk_hfs_compression.c b/libarchive/test/test_write_disk_hfs_compression.c index 2960fe2ed..8a2e7df3b 100644 --- a/libarchive/test/test_write_disk_hfs_compression.c +++ b/libarchive/test/test_write_disk_hfs_compression.c @@ -37,7 +37,7 @@ has_xattr(const char *filename, const char *xattrname) { char *nl, *nlp; ssize_t r; - int exisiting; + int existing; r = listxattr(filename, NULL, 0, XATTR_SHOWCOMPRESSION); if (r < 0) @@ -55,15 +55,15 @@ has_xattr(const char *filename, const char *xattrname) return (0); } - exisiting = 0; + existing = 0; for (nlp = nl; nlp < nl + r; nlp += strlen(nlp) + 1) { if (strcmp(nlp, xattrname) == 0) { - exisiting = 1; + existing = 1; break; } } free(nl); - return (exisiting); + return (existing); } static int get_rsrc_footer(const char *filename, char *buff, size_t s) diff --git a/libarchive/test/test_write_disk_mac_metadata.c b/libarchive/test/test_write_disk_mac_metadata.c index 6e9e72365..be13d96af 100644 --- a/libarchive/test/test_write_disk_mac_metadata.c +++ b/libarchive/test/test_write_disk_mac_metadata.c @@ -67,7 +67,7 @@ has_xattr(const char *filename, const char *xattrname) { char *nl, *nlp; ssize_t r; - int exisiting; + int existing; r = listxattr(filename, NULL, 0, XATTR_SHOWCOMPRESSION); if (r < 0) @@ -85,15 +85,15 @@ has_xattr(const char *filename, const char *xattrname) return (0); } - exisiting = 0; + existing = 0; for (nlp = nl; nlp < nl + r; nlp += strlen(nlp) + 1) { if (strcmp(nlp, xattrname) == 0) { - exisiting = 1; + existing = 1; break; } } free(nl); - return (exisiting); + return (existing); } #endif diff --git a/libarchive/test/test_write_disk_no_hfs_compression.c b/libarchive/test/test_write_disk_no_hfs_compression.c index b7210e204..0af44d246 100644 --- a/libarchive/test/test_write_disk_no_hfs_compression.c +++ b/libarchive/test/test_write_disk_no_hfs_compression.c @@ -37,7 +37,7 @@ has_xattr(const char *filename, const char *xattrname) { char *nl, *nlp; ssize_t r; - int exisiting; + int existing; r = listxattr(filename, NULL, 0, XATTR_SHOWCOMPRESSION); if (r < 0) @@ -55,15 +55,15 @@ has_xattr(const char *filename, const char *xattrname) return (0); } - exisiting = 0; + existing = 0; for (nlp = nl; nlp < nl + r; nlp += strlen(nlp) + 1) { if (strcmp(nlp, xattrname) == 0) { - exisiting = 1; + existing = 1; break; } } free(nl); - return (exisiting); + return (existing); } #endif diff --git a/tar/test/test_option_safe_writes.c b/tar/test/test_option_safe_writes.c index 8edf5c69f..7b42e8f62 100644 --- a/tar/test/test_option_safe_writes.c +++ b/tar/test/test_option_safe_writes.c @@ -58,7 +58,7 @@ DEFINE_TEST(test_option_safe_writes) } assertEqualInt(0, chdir("..")); - /* Extract created archive withe safe writes */ + /* Extract created archive with safe writes */ assertEqualInt(0, systemf("%s -x -C out --safe-writes -f t.tar " ">unpack.out 2>unpack.err", testprog)); -- 2.47.2