From bdd51aef6914cd585f86b0404ef5e8bb2c1c8eab Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sat, 24 Aug 2019 17:38:43 -0700 Subject: [PATCH] Fix some typos --- configure.ac | 2 +- doc/man1/wimupdate.1 | 2 +- include/wimlib.h | 6 +++--- src/blob_table.c | 2 +- src/compress_common.c | 23 +++++++++++------------ src/lzx_compress.c | 2 +- src/win32_apply.c | 2 +- tests/test-imagex-mount | 2 +- 8 files changed, 20 insertions(+), 21 deletions(-) diff --git a/configure.ac b/configure.ac index 642c19b2..659a1e90 100644 --- a/configure.ac +++ b/configure.ac @@ -225,7 +225,7 @@ AM_CONDITIONAL([ENABLE_SSSE3_SHA1], [test "$ENABLE_SSSE3_SHA1" = "yes"]) AC_MSG_CHECKING([whether to include error messages]) AC_ARG_ENABLE([error_messages], - AS_HELP_STRING([--disable-error-messages], [do not compile in error messsages]), + AS_HELP_STRING([--disable-error-messages], [do not compile in error messages]), [ENABLE_ERROR_MESSAGES=$enableval], [ENABLE_ERROR_MESSAGES=yes]) AC_MSG_RESULT([$ENABLE_ERROR_MESSAGES]) diff --git a/doc/man1/wimupdate.1 b/doc/man1/wimupdate.1 index f074be12..a01607bd 100644 --- a/doc/man1/wimupdate.1 +++ b/doc/man1/wimupdate.1 @@ -220,7 +220,7 @@ $ wimupdate boot.wim 2 < update_commands.txt .PP Add some files and directories to a WIM image. Note that the first path of each \fBadd\fR command specifies the files to add, while the second path of each -\fBadd\fR command specify the locations at which to to add them inside the WIM +\fBadd\fR command specify the locations at which to add them inside the WIM image: .PP .RS diff --git a/include/wimlib.h b/include/wimlib.h index 35d2236f..521b32fb 100644 --- a/include/wimlib.h +++ b/include/wimlib.h @@ -2738,7 +2738,7 @@ wimlib_add_tree(WIMStruct *wim, int image, * @param wim_ret * On success, a pointer to the new ::WIMStruct is written to the memory * location pointed to by this parameter. This ::WIMStruct must be freed - * using using wimlib_free() when finished with it. + * using wimlib_free() when finished with it. * * @return 0 on success; a ::wimlib_error_code value on failure. * @@ -3623,8 +3623,8 @@ wimlib_mount_image(WIMStruct *wim, * @param wim_ret * On success, a pointer to a new ::WIMStruct backed by the specified * on-disk WIM file is written to the memory location pointed to by this - * parameter. This ::WIMStruct must be freed using using wimlib_free() - * when finished with it. + * parameter. This ::WIMStruct must be freed using wimlib_free() when + * finished with it. * * @return 0 on success; a ::wimlib_error_code value on failure. * diff --git a/src/blob_table.c b/src/blob_table.c index ab8d0846..3fcde011 100644 --- a/src/blob_table.c +++ b/src/blob_table.c @@ -900,7 +900,7 @@ read_blob_table(WIMStruct *wim) if (!table) goto oom; - /* Allocate and initalize blob descriptors from the raw blob table + /* Allocate and initialize blob descriptors from the raw blob table * buffer. */ for (size_t i = 0; i < num_entries; i++) { const struct blob_descriptor_disk *disk_entry = diff --git a/src/compress_common.c b/src/compress_common.c index c6d1133f..544bcd14 100644 --- a/src/compress_common.c +++ b/src/compress_common.c @@ -544,18 +544,17 @@ gen_codewords(u32 A[restrict], u8 lens[restrict], * shortening the longest codeword that is generated. * * There also is the issue of how codewords longer than @max_codeword_len - * are dealt with. Fortunately, for LZMS this is irrelevant because - * because for the LZMS alphabets no codeword can ever exceed - * LZMS_MAX_CODEWORD_LEN (= 15). Since the LZMS algorithm regularly - * halves all frequencies, the frequencies cannot become high enough for - * a length 16 codeword to be generated. Specifically, I think that if - * ties are broken in favor of non-leaves (as we do), the lowest total - * frequency that would give a length-16 codeword would be the sum of the - * frequencies 1 1 1 3 4 7 11 18 29 47 76 123 199 322 521 843 1364, which - * is 3570. And in LZMS we can't get a frequency that high based on the - * alphabet sizes, rebuild frequencies, and scaling factors. This - * worst-case scenario is based on the following degenerate case (only - * the bottom of the tree shown): + * are dealt with. Fortunately, for LZMS this is irrelevant because for + * the LZMS alphabets no codeword can ever exceed LZMS_MAX_CODEWORD_LEN + * (= 15). Since the LZMS algorithm regularly halves all frequencies, + * the frequencies cannot become high enough for a length 16 codeword to + * be generated. Specifically, I think that if ties are broken in favor + * of non-leaves (as we do), the lowest total frequency that would give a + * length-16 codeword would be the sum of the frequencies 1 1 1 3 4 7 11 + * 18 29 47 76 123 199 322 521 843 1364, which is 3570. And in LZMS we + * can't get a frequency that high based on the alphabet sizes, rebuild + * frequencies, and scaling factors. This worst-case scenario is based + * on the following degenerate case (only the bottom of the tree shown): * * ... * 17 diff --git a/src/lzx_compress.c b/src/lzx_compress.c index ac87a807..110db5dd 100644 --- a/src/lzx_compress.c +++ b/src/lzx_compress.c @@ -1227,7 +1227,7 @@ lzx_flush_block(struct lzx_compressor *c, struct lzx_output_bitstream *os, * but rather we combine many symbols into a single "observation type". For * literals we only look at the high bits and low bits, and for matches we only * look at whether the match is long or not. The assumption is that for typical - * "real" data, places that are good block boundaries will tend to be noticable + * "real" data, places that are good block boundaries will tend to be noticeable * based only on changes in these aggregate frequencies, without looking for * subtle differences in individual symbols. For example, a change from ASCII * bytes to non-ASCII bytes, or from few matches (generally less compressible) diff --git a/src/win32_apply.c b/src/win32_apply.c index c55847d2..8b795f45 100644 --- a/src/win32_apply.c +++ b/src/win32_apply.c @@ -1094,7 +1094,7 @@ prepare_target(struct list_head *dentry_list, struct win32_apply_ctx *ctx) path_max = compute_path_max(dentry_list); /* Add some extra for building Win32 paths for the file encryption APIs, - * and ensure we have at least enough to potentially use a 8.3 name for + * and ensure we have at least enough to potentially use an 8.3 name for * the last component. */ path_max += max(2 + (ctx->target_ntpath.Length / sizeof(wchar_t)), 8 + 1 + 3); diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount index 8a07325a..3c050d7f 100755 --- a/tests/test-imagex-mount +++ b/tests/test-imagex-mount @@ -128,7 +128,7 @@ if ! wimmountrw dir.wim dir tmp.mnt; then error "Failed to re-mount test WIM read-write" fi if ! imagex_unmount tmp.mnt --commit --check; then - error "Failed to unmount read-write mounted WIM with changes commited (no changes made)" + error "Failed to unmount read-write mounted WIM with changes committed (no changes made)" fi echo "Testing removing file from mounted WIM" if ! wimmountrw dir.wim dir tmp.mnt; then -- 2.43.0