From f8d87ed9f0d546ac5b05e8e7d2b148d4b77599fa Mon Sep 17 00:00:00 2001

From: Colin Ian King <colin.king@canonical.com>

Date: Mon, 16 Aug 2021 11:13:08 +0100

Subject: [Backport f8d87ed9f0d5] src: Fix various spelling mistakes

There is a spelling mistake in a ntfs_err error message. Also

fix various spelling mistakes in comments.

Signed-off-by: Colin Ian King <colin.king@canonical.com>

Reviewed-by: Kari Argillander <kari.argillander@gmail.com>

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

---

 src/debug.h                 | 2 +-

 src/lib/decompress_common.c | 2 +-

 src/run.c                   | 2 +-

 src/super.c                 | 4 ++--

 src/upcase.c                | 2 +-

 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/debug.h b/src/debug.h

index dfaa4c79dc6d86677b0b3de5c98a54a23ef637d6..15ac42185e5b39525ec7ead599975946d9d0b679 100644

--- a/src/debug.h

+++ b/src/debug.h

@@ -3,7 +3,7 @@

  *

  * Copyright (C) 2019-2021 Paragon Software GmbH, All rights reserved.

  *

- * useful functions for debuging

+ * useful functions for debugging

  */

 // clang-format off

diff --git a/src/lib/decompress_common.c b/src/lib/decompress_common.c

index 83c9e93aea77e437b5b1889b49272eee64d4df64..850d8e8c8f1fc75aa46e8f236b0c682daaf30d8f 100644

--- a/src/lib/decompress_common.c

+++ b/src/lib/decompress_common.c

@@ -292,7 +292,7 @@ int make_huffman_decode_table(u16 decode_table[], const u32 num_syms,

 				 * of as simply the root of the tree.  The

 				 * representation of these internal nodes is

 				 * simply the index of the left child combined

-				 * with the special bits 0xC000 to distingush

+				 * with the special bits 0xC000 to distinguish

 				 * the entry from direct mapping and leaf node

 				 * entries.

 				 */

diff --git a/src/run.c b/src/run.c

index 5cdf6efe67e0dbee860ce8462eae8de363ea5671..f9c362ac672e96b9430ab211de4952d6dce7797a 100644

--- a/src/run.c

+++ b/src/run.c

@@ -949,7 +949,7 @@ int run_unpack(struct runs_tree *run, struct ntfs_sb_info *sbi, CLST ino,

 		if (next_vcn > 0x100000000ull || (lcn + len) > 0x100000000ull) {

 			ntfs_err(

 				sbi->sb,

-				"This driver is compiled whitout CONFIG_NTFS3_64BIT_CLUSTER (like windows driver).\n"

+				"This driver is compiled without CONFIG_NTFS3_64BIT_CLUSTER (like windows driver).\n"

 				"Volume contains 64 bits run: vcn %llx, lcn %llx, len %llx.\n"

 				"Activate CONFIG_NTFS3_64BIT_CLUSTER to process this case",

 				vcn64, lcn, len);

diff --git a/src/super.c b/src/super.c

index 6be13e256c1ad18d21ed5727cf8a1129840e774e..84d4f389f6855091f3dc9be77f50c5e6acf99706 100644

--- a/src/super.c

+++ b/src/super.c

@@ -124,7 +124,7 @@ void ntfs_inode_printk(struct inode *inode, const char *fmt, ...)

 /*

  * Shared memory struct.

  *

- * on-disk ntfs's upcase table is created by ntfs formater

+ * on-disk ntfs's upcase table is created by ntfs formatter

  * 'upcase' table is 128K bytes of memory

  * we should read it into memory when mounting

  * Several ntfs volumes likely use the same 'upcase' table

@@ -1208,7 +1208,7 @@ static int ntfs_fill_super(struct super_block *sb, void *data, int silent)

 	sbi->def_entries = 1;

 	done = sizeof(struct ATTR_DEF_ENTRY);

 	sbi->reparse.max_size = MAXIMUM_REPARSE_DATA_BUFFER_SIZE;

-	sbi->ea_max_size = 0x10000; /* default formater value */

+	sbi->ea_max_size = 0x10000; /* default formatter value */

 	while (done + sizeof(struct ATTR_DEF_ENTRY) <= bytes) {

 		u32 t32 = le32_to_cpu(t->type);

diff --git a/src/upcase.c b/src/upcase.c

index 9617382aca64b3ee322f7f769fbff38b8db52dbb..b53943538f9f2525764371ca0d925da295dbb10a 100644

--- a/src/upcase.c

+++ b/src/upcase.c

@@ -27,7 +27,7 @@ static inline u16 upcase_unicode_char(const u16 *upcase, u16 chr)

 /*

  * Thanks Kari Argillander <kari.argillander@gmail.com> for idea and implementation 'bothcase'

  *

- * Straigth way to compare names:

+ * Straight way to compare names:

  * - case insensitive

  * - if name equals and 'bothcases' then

  * - case sensitive

-- 

2.31.1