Fix typos in code comments and developer docs

Signed-off-by: Sebastian Rasmussen <[email protected]> Signed-off-by: Theodore Ts'o <[email protected]> Reviewed-by: Andreas Dilger <[email protected]>
SpiceOS-Beta · Oct 16, 2017 · 055866d · 055866d
1 parent ce20096
commit 055866d
Show file tree

Hide file tree

Showing 81 changed files with 125 additions and 125 deletions.
diff --git a/INSTALL b/INSTALL
@@ -56,7 +56,7 @@ frequency, and the fsck pass number, respectively.  The problem with
 this is that the getmntent() library routine interprets those missing
 fields as "0", and a pass number of 0 is documented as meaning that
 fsck should not check that particular filesystem.  If your entries in
-your /etc/fstab file look liks this:
+your /etc/fstab file look like this:
 
 /dev/hda4       /        ext2        defaults
 

diff --git a/INSTALL.elfbin b/INSTALL.elfbin
@@ -35,7 +35,7 @@ frequency, and the fsck pass number, respectively.  The problem with
 this is that the getmntent() library routine interprets those missing
 fields as "0", and a pass number of 0 is documented as meaning that
 fsck should not check that particular filesystem.  If your entries in
-your /etc/fstab file look liks this:
+your /etc/fstab file look like this:
 
 /dev/hda4       /        ext2        defaults
 

diff --git a/TODO b/TODO
@@ -29,7 +29,7 @@ Date: Mon, 08 Mar 1999 21:46:14 +0100
 From: Sergio Polini <[email protected]>
 
 
-I'm reading the sorce code of e2fsck 1.14.
+I'm reading the source code of e2fsck 1.14.
 In pass2.c, lines 352-357, I read:
 
 if ((dirent->name_len & 0xFF) > EXT2_NAME_LEN) {
@@ -72,7 +72,7 @@ directories by using debugfs to get the relevant block numbers, then
 using dd to get the actual data.
 
 If debugfs had a feature where it ignored the size of a directory reported by
-the inode and instead just dumped all the blocks, it would have facilited
+the inode and instead just dumped all the blocks, it would have facilitated
 things a bit. This seems like a very easy feature to add.
 
 Again, thanks for writing debugfs (and all the other Linux stuff you've written!).

diff --git a/aclocal.m4 b/aclocal.m4
@@ -1884,7 +1884,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
     fi
 ])
   dnl Search the library and its dependencies in $additional_libdir and
-  dnl $LDFLAGS. Using breadth-first-seach.
+  dnl $LDFLAGS. Using breadth-first-search.
   LIB[]NAME=
   LTLIB[]NAME=
   INC[]NAME=
@@ -2912,7 +2912,7 @@ fi[]dnl
 # to PKG_CHECK_MODULES(), but does not set variables or print errors.
 #
 # Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
+# only at the first occurrence in configure.ac, so if the first place
 # it's called might be skipped (such as if it is within an "if", you
 # have to call PKG_CHECK_EXISTS manually
 # --------------------------------------------------------------

diff --git a/configure.ac b/configure.ac
@@ -124,8 +124,8 @@ else
 fi
 AC_USE_SYSTEM_EXTENSIONS
 dnl
-dnl Set default values for library extentions.  Will be dealt with after
-dnl parsing configuration opions, which may modify these
+dnl Set default values for library extensions.  Will be dealt with after
+dnl parsing configuration options, which may modify these
 dnl
 LIB_EXT=.a
 STATIC_LIB_EXT=.a
@@ -975,7 +975,7 @@ AC_CHECK_HEADERS(net/if.h,,,
 ]])
 AC_FUNC_VPRINTF
 dnl Check to see if dirent has member d_reclen. On cygwin those d_reclen
-dnl is not decleared.
+dnl is not declared.
 AC_CHECK_MEMBER(struct dirent.d_reclen,[AC_DEFINE(HAVE_RECLEN_DIRENT, 1,
 		       [Define to 1 if dirent has d_reclen])],,
 		[#include <dirent.h>])

diff --git a/contrib/add_ext4_encrypt.c b/contrib/add_ext4_encrypt.c
@@ -1,5 +1,5 @@
 /*
- * Basic progam to add ext4 encryption to a file system
+ * Basic program to add ext4 encryption to a file system
  *
  * Copyright 2015, Google, Inc.
  *

diff --git a/debian/rules b/debian/rules
@@ -304,7 +304,7 @@ install: cleanup install-std
 
 # This rule allows to factorize the dh_clean between the 2 install rules
 # This must be launched before install-* (if launching them by hand, for
-# exemple) or results are unpredictable
+# example) or results are unpredictable
 cleanup:
 	dh_testdir
 	dh_testroot

diff --git a/debian/uuid-dev.README.Debian b/debian/uuid-dev.README.Debian
@@ -1,5 +1,5 @@
 
-In order to santize e2fsprogs to be DFSG free, the file
+In order to sanitize e2fsprogs to be DFSG free, the file
 draft-leach-uuids-guids-01.txt has been removed.  It can be obtained
 by downloading e2fsprogs from the upstream sources.  It may also be
 available from other sites on the network, if you do a quick web
@@ -16,7 +16,7 @@ the documentation which has been removed for Debian's DFSG license
 purity shouldn't be denied to Ubuntu users.
 
 					Theodore Ts'o
-					Ocotober 3, 2006
+					October 3, 2006
 
 
 

diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in
@@ -46,7 +46,7 @@ STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBSS) \
 		$(DEPSTATIC_LIBCOM_ERR) $(DEPSTATIC_LIBUUID) \
 		$(DEPSTATIC_LIBE2P)
 
-# This nastyness is needed because of jfs_user.h hackery; when we finally
+# This nastiness is needed because of jfs_user.h hackery; when we finally
 # clean up this mess, we should be able to drop it
 LOCAL_CFLAGS = -I$(srcdir)/../e2fsck -DDEBUGFS
 DEPEND_CFLAGS = -I$(srcdir)

diff --git a/debugfs/logdump.c b/debugfs/logdump.c
@@ -1,7 +1,7 @@
 /*
  * logdump.c --- dump the contents of the journal out to a file
  *
- * Authro: Stephen C. Tweedie, 2001  <[email protected]>
+ * Author: Stephen C. Tweedie, 2001  <[email protected]>
  * Copyright (C) 2001 Red Hat, Inc.
  * Based on portions  Copyright (C) 1994 Theodore Ts'o.
  *

diff --git a/debugfs/set_fields.c b/debugfs/set_fields.c
@@ -430,7 +430,7 @@ static struct field_set_info *find_field(struct field_set_info *fields,
 
 /*
  * Note: info->size == 6 is special; this means a base size 4 bytes,
- * and secondiory (high) size of 2 bytes.  This is needed for the
+ * and secondary (high) size of 2 bytes.  This is needed for the
  * special case of i_blocks_high and i_file_acl_high.
  */
 static errcode_t parse_uint(struct field_set_info *info, char *field,

diff --git a/debugfs/util.c b/debugfs/util.c
@@ -210,7 +210,7 @@ char *time_to_string(__s64 cl)
 	const char	*tz;
 
 	if (do_gmt == -1) {
-		/* The diet libc doesn't respect the TZ environemnt variable */
+		/* The diet libc doesn't respect the TZ environment variable */
 		tz = ss_safe_getenv("TZ");
 		if (!tz)
 			tz = "";

diff --git a/e2fsck/message.c b/e2fsck/message.c
@@ -224,7 +224,7 @@ static void print_time(FILE *f, time_t t)
 	static int		do_gmt = -1;
 
 #ifdef __dietlibc__
-		/* The diet libc doesn't respect the TZ environemnt variable */
+		/* The diet libc doesn't respect the TZ environment variable */
 		if (do_gmt == -1) {
 			time_str = getenv("TZ");
 			if (!time_str)

diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
@@ -29,7 +29,7 @@
  *
  * Pass 1 is designed to stash away enough information so that the
  * other passes should not need to read in the inode information
- * during the normal course of a filesystem check.  (Althogh if an
+ * during the normal course of a filesystem check.  (Although if an
  * inconsistency is detected, other passes may need to read in an
  * inode to fix it.)
  *
@@ -1581,7 +1581,7 @@ void e2fsck_pass1(e2fsck_t ctx)
 			/*
 			 * Make sure the root inode is a directory; if
 			 * not, offer to clear it.  It will be
-			 * regnerated in pass #3.
+			 * regenerated in pass #3.
 			 */
 			if (!LINUX_S_ISDIR(inode->i_mode)) {
 				if (fix_problem(ctx, PR_1_ROOT_NO_DIR, &pctx))
@@ -3948,7 +3948,7 @@ static void mark_table_blocks(e2fsck_t ctx)
 }
 
 /*
- * Thes subroutines short circuits ext2fs_get_blocks and
+ * These subroutines short circuits ext2fs_get_blocks and
  * ext2fs_check_directory; we use them since we already have the inode
  * structure, so there's no point in letting the ext2fs library read
  * the inode again.

diff --git a/e2fsck/pass1b.c b/e2fsck/pass1b.c
@@ -919,7 +919,7 @@ static errcode_t clone_file(e2fsck_t ctx, ext2_ino_t ino,
 					sizeof(dp->inode), "clone file EA");
 		/*
 		 * If we cloned the EA block, find all other inodes
-		 * which refered to that EA block, and modify
+		 * which referred to that EA block, and modify
 		 * them to point to the new EA block.
 		 */
 		n = dict_lookup(&clstr_dict,

diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c
@@ -1602,7 +1602,7 @@ static int deallocate_inode_block(ext2_filsys fs,
 }
 
 /*
- * This fuction deallocates an inode
+ * This function deallocates an inode
  */
 static void deallocate_inode(e2fsck_t ctx, ext2_ino_t ino, char* block_buf)
 {
@@ -1672,7 +1672,7 @@ static void deallocate_inode(e2fsck_t ctx, ext2_ino_t ino, char* block_buf)
 }
 
 /*
- * This fuction clears the htree flag on an inode
+ * This function clears the htree flag on an inode
  */
 static void clear_htree(e2fsck_t ctx, ext2_ino_t ino)
 {

diff --git a/e2fsck/pass3.c b/e2fsck/pass3.c
@@ -15,7 +15,7 @@
  * not, e2fsck will offer to create a new one.  It is then marked as
  * "done".
  *
- * Then, pass3 interates over all directory inodes; for each directory
+ * Then, pass3 iterates over all directory inodes; for each directory
  * it attempts to trace up the filesystem tree, using dirinfo.parent
  * until it reaches a directory which has been marked "done".  If it
  * can not do so, then the directory must be disconnected, and e2fsck

diff --git a/e2fsck/pass5.c b/e2fsck/pass5.c
@@ -302,7 +302,7 @@ static void print_bitmap_problem(e2fsck_t ctx, problem_t problem,
 	pctx->ino = pctx->ino2 = 0;
 }
 
-/* Just to be more succint */
+/* Just to be more succinct */
 #define B2C(x)	EXT2FS_B2C(fs, (x))
 #define EQ_CLSTR(x, y) (B2C(x) == B2C(y))
 #define LE_CLSTR(x, y) (B2C(x) <= B2C(y))

diff --git a/e2fsck/problem.c b/e2fsck/problem.c
@@ -174,7 +174,7 @@ static struct e2fsck_problem problem_table[] = {
 	  N_("Corruption found in @S.  (%s = %N).\n"),
 	  PROMPT_NONE, PR_AFTER_CODE, PR_0_SB_CORRUPT },
 
-	/* Error determing physical device size of filesystem */
+	/* Error determining physical device size of filesystem */
 	{ PR_0_GETSIZE_ERROR,
 	  N_("Error determining size of the physical @v: %m\n"),
 	  PROMPT_NONE, PR_FATAL },
@@ -1311,7 +1311,7 @@ static struct e2fsck_problem problem_table[] = {
 	  N_("@E has @D/unused @i %Di.  "),
 	  PROMPT_CLEAR, PR_PREEN_OK },
 
-	/* Directry entry is link to '.' */
+	/* Directory entry is link to '.' */
 	{ PR_2_LINK_DOT,
 	  N_("@E @L to '.'  "),
 	  PROMPT_CLEAR, 0 },
@@ -1326,7 +1326,7 @@ static struct e2fsck_problem problem_table[] = {
 	  N_("@E @L to @d %P (%Di).\n"),
 	  PROMPT_CLEAR, 0 },
 
-	/* Directory entry contains a link to the root directry */
+	/* Directory entry contains a link to the root directory */
 	{ PR_2_LINK_ROOT,
 	  N_("@E @L to the @r.\n"),
 	  PROMPT_CLEAR, 0 },

diff --git a/e2fsck/problem.h b/e2fsck/problem.h
@@ -91,7 +91,7 @@ struct problem_context {
 /* Miscellaneous superblock corruption */
 #define PR_0_MISC_CORRUPT_SUPER			0x00000B
 
-/* Error determing physical device size of filesystem */
+/* Error determining physical device size of filesystem */
 #define PR_0_GETSIZE_ERROR			0x00000C
 
 /* Inode count in the superblock incorrect */
@@ -783,7 +783,7 @@ struct problem_context {
 /* Directory entry has deleted or unused inode */
 #define PR_2_UNUSED_INODE	0x020003
 
-/* Directry entry is link to '.' */
+/* Directory entry is link to '.' */
 #define PR_2_LINK_DOT		0x020004
 
 /* Directory entry points to inode now located in a bad block */
@@ -792,7 +792,7 @@ struct problem_context {
 /* Directory entry contains a link to a directory */
 #define PR_2_LINK_DIR		0x020006
 
-/* Directory entry contains a link to the root directry */
+/* Directory entry contains a link to the root directory */
 #define PR_2_LINK_ROOT		0x020007
 
 /* Directory entry has illegal characters in its name */
@@ -1082,7 +1082,7 @@ struct problem_context {
 #define PR_3_LPF_ENCRYPTED		0x03001B
 
 /*
- * Pass 3a --- rehashing diretories
+ * Pass 3a --- rehashing directories
  */
 /* Pass 3a: Reindexing directories */
 #define PR_3A_PASS_HEADER		0x031000
@@ -1196,7 +1196,7 @@ struct problem_context {
 /* Inode range not used, but marked in bitmap */
 #define PR_5_INODE_RANGE_UNUSED		0x050016
 
-/* Inode rangeused, but not marked used in bitmap */
+/* Inode range used, but not marked used in bitmap */
 #define PR_5_INODE_RANGE_USED		0x050017
 
 /* Block in use but group is marked BLOCK_UNINIT */

diff --git a/e2fsck/recovery.c b/e2fsck/recovery.c
@@ -325,7 +325,7 @@ int journal_recover(journal_t *journal)
  * Locate any valid recovery information from the journal and set up the
  * journal structures in memory to ignore it (presumably because the
  * caller has evidence that it is out of date).
- * This function does'nt appear to be exorted..
+ * This function doesn't appear to be exported..
  *
  * We perform one pass over the journal to allow us to tell the user how
  * much recovery information is being erased, and to let us initialise
@@ -689,7 +689,7 @@ static int do_one_pass(journal_t *journal,
 			 *		| GO TO NEXT    "Journal Corruption"
 			 *		| TRANSACTION
 			 *		|
-			 * {(n+1)th transanction}
+			 * {(n+1)th transaction}
 			 *		|
 			 * 	 _______|______________
 			 * 	|	 	      |

diff --git a/e2fsck/region.c b/e2fsck/region.c
@@ -84,7 +84,7 @@ int region_allocate(region_t region, region_addr_t start, int n)
 
 	/*
 	 * Search through the linked list.  If we find that it
-	 * conflicts witih something that's already allocated, return
+	 * conflicts with something that's already allocated, return
 	 * 1; if we can find an existing region which we can grow, do
 	 * so.  Otherwise, stop when we find the appropriate place
 	 * insert a new region element into the linked list.

diff --git a/e2fsck/unix.c b/e2fsck/unix.c
@@ -1214,7 +1214,7 @@ static errcode_t e2fsck_check_mmp(ext2_filsys fs, e2fsck_t ctx)
 	if (retval)
 		goto check_error;
 
-	/* Print warning if e2fck will wait for more than 20 secs. */
+	/* Print warning if e2fsck will wait for more than 20 secs. */
 	if (verbose || wait_time > EXT4_MMP_MIN_CHECK_INTERVAL * 4) {
 		log_out(ctx, _("MMP interval is %u seconds and total wait "
 			       "time is %u seconds. Please wait...\n"),

diff --git a/e2fsck/util.c b/e2fsck/util.c
@@ -735,7 +735,7 @@ int check_for_modules(const char *fs_name)
 
 /*
  * Helper function that does the right thing if write returns a
- * partial write, or an EGAIN/EINTR error.
+ * partial write, or an EAGAIN/EINTR error.
  */
 int write_all(int fd, char *buf, size_t count)
 {

diff --git a/ext2ed/README b/ext2ed/README
@@ -48,10 +48,10 @@ This is version 0.2 of ext2ed - The extended-2 filesystem editor.
 Modifications on Apr 5 2001
 This is minor bug fixes to ext2ed, as of April 2001.
 It supports modern ext2 version that has file type in directory structure
-and fixes the missunderstanding between ncurses and
+and fixes the misunderstanding between ncurses and
 readline.
 
-I first applied patches from Redhat except the one for readline that 
+I first applied patches from Red Hat except the one for readline that 
 rewrote a readline behavior.
 
 Globals diffs between version 0.1 and 0.2 is stored in file :
@@ -114,7 +114,7 @@ that ncurses will be properly installed on your system:
 	set your TERM environment variable to 'linux' or link
 	l/linux to c/console in the terminfo database.
 
-4.	The percompiled binary was linked with ncurses 1.9.4 and will search
+4.	The precompiled binary was linked with ncurses 1.9.4 and will search
 	for the terminfo database on /usr/local/lib/terminfo. If you are
 	using it, and your 1.9.4 compatible terminfo database is not on the
 	directory above, use the TERMINFO environment variable to specify

diff --git a/ext2ed/dir_com.c b/ext2ed/dir_com.c
@@ -539,7 +539,7 @@ void type_dir___remember (char *command_line)
 
 /*
 
-This is overrided here because we don't remember a directory - It is too complicated. Instead, we remember the
+This is overridden here because we don't remember a directory - It is too complicated. Instead, we remember the
 inode of the current directory.
 
 */

diff --git a/ext2ed/disk.c b/ext2ed/disk.c
@@ -14,7 +14,7 @@ double check the various permissions and possible errors here.
 The major update which needs to be done here is switching to the use of the llseek system call, so that we will
 be able to support ext2 filesystems up to 4 TB. Currently, due to the standard fseek usage, we can't handle
 filesystems bigger than 4 GB. The limit is actually 2 GB because I used long rather than unsigned long long at too
-many places in the program. To conclude - This upgrade needs to be done carefuly; There are many places to change.
+many places in the program. To conclude - This upgrade needs to be done carefully; There are many places to change.
 
 First written on: April 9 1995
 

diff --git a/ext2ed/ext2ed.conf.in b/ext2ed/ext2ed.conf.in
@@ -52,8 +52,8 @@ AllowMountedRead	on
 
 # When ForceExt2 is set to on, the filesystem is assumed to be ext2
 # filesystem, despite the possibly corrupt superblock magic number reading.
-# All the ext2 specific commands will be aviable despite the possible
-# autodetection failture.
+# All the ext2 specific commands will be available despite the possible
+# autodetection failure.
 
 ForceExt2		off
-Original file line number
+Diff line change
@@ Expand Up / @@ -539,7 +539,7 @@ void type_dir___remember (char *command_line) @@
     /*
-    This is overrided here because we don't remember a directory - It is too complicated. Instead, we remember the
+    This is overridden here because we don't remember a directory - It is too complicated. Instead, we remember the
     inode of the current directory.
     */
@@ Expand Down @@