Remove duplicate words & fix grammatical errors

diff --git a/README b/README
index c911c429916edbdec8b4b4b44e9754013a061ea1..9a0dd07346bbf3ab7712d674c4e15a428ab30eea 100644 (file)
--- a/README
+++ b/README
@@ -182,7 +182,7 @@ platform-dependent way:
 
 For both platforms the code for NTFS capture and extraction is complete enough
 that it is possible to apply an image from the "install.wim" contained in recent
 
 For both platforms the code for NTFS capture and extraction is complete enough
 that it is possible to apply an image from the "install.wim" contained in recent

-Windows installation media (Vista, Windows 7, or Windows 8) directly to a NTFS
+Windows installation media (Vista, Windows 7, or Windows 8) directly to an NTFS

 filesystem, and then boot Windows from it after preparing the Boot Configuration
 Data.  In addition, a Windows installation can be captured (or backed up) into a
 WIM file, and then re-applied later.
 filesystem, and then boot Windows from it after preparing the Boot Configuration
 Data.  In addition, a Windows installation can be captured (or backed up) into a
 WIM file, and then re-applied later.

diff --git a/configure.ac b/configure.ac
index 75f4bd631238085ffc90fad549b7dac010d24293..cdcc1dadfc981c0ca110cadbbd814a95ac0b62ec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -241,7 +241,7 @@ if test "x$WITH_NTFS_3G" = "xyes"; then
        PKG_CHECK_MODULES([LIBNTFS_3G], [libntfs-3g])
        PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES libntfs-3g"
 
        PKG_CHECK_MODULES([LIBNTFS_3G], [libntfs-3g])
        PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES libntfs-3g"
 

-       dnl This checks for a NTFS-3g interface that was changed in the
+       dnl This checks for an NTFS-3g interface that was changed in the

        dnl 2013.1.13 release
        AC_CHECK_DECL([NTFS_MNT_RDONLY],
                      [AC_DEFINE([HAVE_NTFS_MNT_RDONLY],
        dnl 2013.1.13 release
        AC_CHECK_DECL([NTFS_MNT_RDONLY],
                      [AC_DEFINE([HAVE_NTFS_MNT_RDONLY],

diff --git a/doc/man1/imagex-export.1.in b/doc/man1/imagex-export.1.in
index 4d4d6c2e6e979eed8167cd65e319a05796a91064..639af81c5379ef28e5926bab24c8470cab15648e 100644 (file)
--- a/doc/man1/imagex-export.1.in
+++ b/doc/man1/imagex-export.1.in
@@ -8,7 +8,7 @@
 .SH DESCRIPTION
 Copies the specified image in \fISRC_WIMFILE\fR to \fIDEST_WIMFILE\fR,
 optionally changing its name and/or description and/or compression type.
 .SH DESCRIPTION
 Copies the specified image in \fISRC_WIMFILE\fR to \fIDEST_WIMFILE\fR,
 optionally changing its name and/or description and/or compression type.

-If \fIDEST_WIMFILE\fR exists, it is taken be be a WIM archive to which the image
+If \fIDEST_WIMFILE\fR exists, it is taken be a WIM archive to which the image

 will be appended.  Otherwise, it is created as a new WIM archive containing only
 the exported image.
 This command is also available as simply \fBwimexport\fR if the appropriate hard
 will be appended.  Otherwise, it is created as a new WIM archive containing only
 the exported image.
 This command is also available as simply \fBwimexport\fR if the appropriate hard

diff --git a/doc/man1/imagex-extract.1.in b/doc/man1/imagex-extract.1.in
index ca3ae692e9c66477b54c5d8c5a5e16e5a93ffded..cf60cbe6818fd30f6c138c684402b5cb27444dbe 100644 (file)
--- a/doc/man1/imagex-extract.1.in
+++ b/doc/man1/imagex-extract.1.in
@@ -159,7 +159,7 @@ point within the extraction location) are never done by \fB@IMAGEX_PROGNAME@
 extract\fR.  Use \fB@IMAGEX_PROGNAME@ apply\fR if you want this behavior.
 .PP
 Unlike \fB@IMAGEX_PROGNAME@ apply\fR, \fB@IMAGEX_PROGNAME@ extract\fR does not
 extract\fR.  Use \fB@IMAGEX_PROGNAME@ apply\fR if you want this behavior.
 .PP
 Unlike \fB@IMAGEX_PROGNAME@ apply\fR, \fB@IMAGEX_PROGNAME@ extract\fR does not

-support extracting files directly to a NTFS volume using libntfs-3g.
+support extracting files directly to an NTFS volume using libntfs-3g.

 .PP
 wimlib v1.6.0 and later can extract files from version 3584 WIMs, which usually
 use packed, LZMS-compressed streams and may carry the \fI.esd\fR file extension
 .PP
 wimlib v1.6.0 and later can extract files from version 3584 WIMs, which usually
 use packed, LZMS-compressed streams and may carry the \fI.esd\fR file extension

diff --git a/doc/man1/imagex-mount.1.in b/doc/man1/imagex-mount.1.in
index ef6367841277f7650869278decbc7afca223f7d0..7ebf0598cefa42aba43b09a3c4df8a8dff2447c4 100644 (file)
--- a/doc/man1/imagex-mount.1.in
+++ b/doc/man1/imagex-mount.1.in
@@ -125,7 +125,7 @@ Only valid for \fB@IMAGEX_PROGNAME@ mountrw\fR.
 \fB--unix-data\fR
 By default, \fB@IMAGEX_PROGNAME@ mount\fR and \fB@IMAGEX_PROGNAME@ mountrw\fR will ignore both
 Windows-style security descriptors (which may have been set either from Windows or by
 \fB--unix-data\fR
 By default, \fB@IMAGEX_PROGNAME@ mount\fR and \fB@IMAGEX_PROGNAME@ mountrw\fR will ignore both
 Windows-style security descriptors (which may have been set either from Windows or by

-\fB@IMAGEX_PROGNAME@ capture\fR from a NTFS-volume) and UNIX-specific data (which is from using
+\fB@IMAGEX_PROGNAME@ capture\fR from an NTFS-volume) and UNIX-specific data (which is from using

 \fB@IMAGEX_PROGNAME@ capture\fR with the \fB--unix-data\fR flag).  In this default mode,
 all files will simply be owned by the user running \fB@IMAGEX_PROGNAME@\fR and will have mode 0777.
 (Note: they will still not be accessible to other users unless you also specify
 \fB@IMAGEX_PROGNAME@ capture\fR with the \fB--unix-data\fR flag).  In this default mode,
 all files will simply be owned by the user running \fB@IMAGEX_PROGNAME@\fR and will have mode 0777.
 (Note: they will still not be accessible to other users unless you also specify

diff --git a/doc/man1/imagex-split.1.in b/doc/man1/imagex-split.1.in
index b425f91cc2c4bcff430e6acd5f17c46cb4345f9c..2809f43a676cb78a20811b5abbae4ccf983bcf8b 100644 (file)
--- a/doc/man1/imagex-split.1.in
+++ b/doc/man1/imagex-split.1.in
@@ -26,7 +26,7 @@ etc. where each part is at most 100 MiB:
 @IMAGEX_PROGNAME@ split windows.wim windows.swm 100
 .RE
 .SH LIMITATIONS
 @IMAGEX_PROGNAME@ split windows.wim windows.swm 100
 .RE
 .SH LIMITATIONS

-It it possible for the size of the parts to exceed the \fIPART_SIZE\fR given.
+It is possible for the size of the parts to exceed the \fIPART_SIZE\fR given.

 This is impossible to avoid
 because the WIM file format provides no way to divide a single file resource in
 the WIM among multiple split WIM parts.  So if you, for example, have a file
 This is impossible to avoid
 because the WIM file format provides no way to divide a single file resource in
 the WIM among multiple split WIM parts.  So if you, for example, have a file

diff --git a/doc/man1/imagex-update.1.in b/doc/man1/imagex-update.1.in
index 7ed9f8840ad74cba0e049b3cfefa02afd3819a29..22902355efa8d8a22f03b1ca837ca1d812fe2e03 100644 (file)
--- a/doc/man1/imagex-update.1.in
+++ b/doc/man1/imagex-update.1.in
@@ -192,7 +192,7 @@ comment lines beginning with '#' are allowed, and it is also possible to quote
 arguments with whitespace inside them.
 .PP
 On UNIX-like systems, you cannot use \fB@IMAGEX_PROGNAME@ update\fR to add files
 arguments with whitespace inside them.
 .PP
 On UNIX-like systems, you cannot use \fB@IMAGEX_PROGNAME@ update\fR to add files

-to an image directly from a NTFS volume using libntfs-3g, even though
+to an image directly from an NTFS volume using libntfs-3g, even though

 \fB@IMAGEX_PROGNAME@ capture\fR supports capturing a full image this way.
 .PP
 It is safe to abort an \fB@IMAGEX_PROGNAME@ update\fR command partway through;
 \fB@IMAGEX_PROGNAME@ capture\fR supports capturing a full image this way.
 .PP
 It is safe to abort an \fB@IMAGEX_PROGNAME@ update\fR command partway through;

diff --git a/doc/man1/imagex.1.in b/doc/man1/imagex.1.in
index e395ad6b739bc03beab55fa00820af0215f45328..53a4b786900387f0d9401ee25354230430ed02ea 100644 (file)
--- a/doc/man1/imagex.1.in
+++ b/doc/man1/imagex.1.in
@@ -132,7 +132,7 @@ directly from a block device containing an NTFS volume, or applying a WIM image
 directly to a block device containing an NTFS volume.  This allows saving and
 restoring NTFS-specific data, such as security descriptors and named data
 streams, which is otherwise only supported on Windows.  This feature is
 directly to a block device containing an NTFS volume.  This allows saving and
 restoring NTFS-specific data, such as security descriptors and named data
 streams, which is otherwise only supported on Windows.  This feature is

-unavailable if wimlib was was configured using --without-ntfs-3g.
+unavailable if wimlib was configured using --without-ntfs-3g.

 .IP \[bu]
 Long path support on Windows.  \fB@IMAGEX_PROGNAME@\fR can capture and apply
 files with paths exceeding the MAX_PATH (260 character) limitation of the Win32
 .IP \[bu]
 Long path support on Windows.  \fB@IMAGEX_PROGNAME@\fR can capture and apply
 files with paths exceeding the MAX_PATH (260 character) limitation of the Win32


@@ -178,7 +178,7 @@ Delta WIMs.  A delta WIM contains image metadata but excludes file data already
 present in another WIM file.  A delta WIM can be created using
 \fB@IMAGEX_PROGNAME@ capture\fR with the \fB--delta-from\fR option.
 .IP \[bu]
 present in another WIM file.  A delta WIM can be created using
 \fB@IMAGEX_PROGNAME@ capture\fR with the \fB--delta-from\fR option.
 .IP \[bu]

-WIMBoot support.  On Windows 8.1 and later, files on a NTFS volume can be
+WIMBoot support.  On Windows 8.1 and later, files on an NTFS volume can be

 externally backed by a WIM archive with the help of Microsoft's Windows Overlay
 FileSystem Filter Driver (WOF).  With the \fB--wimboot\fR flag,
 \fB@IMAGEX_PROGNAME@ apply\fR will extract "pointer files" (actually NTFS
 externally backed by a WIM archive with the help of Microsoft's Windows Overlay
 FileSystem Filter Driver (WOF).  With the \fB--wimboot\fR flag,
 \fB@IMAGEX_PROGNAME@ apply\fR will extract "pointer files" (actually NTFS

diff --git a/include/wimlib.h b/include/wimlib.h
index 946caf88080a40196cb94a718086f800746695dc..1b62717de940673fc9a33ce2d26dbd95fdd9d554 100644 (file)
--- a/include/wimlib.h
+++ b/include/wimlib.h
@@ -682,14 +682,14 @@ union wimlib_progress_info {
         * ::WIMLIB_PROGRESS_MSG_SCAN_DENTRY, and
         * ::WIMLIB_PROGRESS_MSG_SCAN_END.  */
        struct wimlib_progress_info_scan {
         * ::WIMLIB_PROGRESS_MSG_SCAN_DENTRY, and
         * ::WIMLIB_PROGRESS_MSG_SCAN_END.  */
        struct wimlib_progress_info_scan {

-               /** Top-level directory being scanned; or, when capturing a NTFS
+               /** Top-level directory being scanned; or, when capturing an NTFS

                 * volume with ::WIMLIB_ADD_FLAG_NTFS, this is instead the path
                 * to the file or block device that contains the NTFS volume
                 * being scanned.  */
                const wimlib_tchar *source;
 
                /** Path to the file (or directory) that has been scanned, valid
                 * volume with ::WIMLIB_ADD_FLAG_NTFS, this is instead the path
                 * to the file or block device that contains the NTFS volume
                 * being scanned.  */
                const wimlib_tchar *source;
 
                /** Path to the file (or directory) that has been scanned, valid

-                * on ::WIMLIB_PROGRESS_MSG_SCAN_DENTRY.  When capturing a NTFS
+                * on ::WIMLIB_PROGRESS_MSG_SCAN_DENTRY.  When capturing an NTFS

                 * volume with ::WIMLIB_ADD_FLAG_NTFS, this path will be
                 * relative to the root of the NTFS volume.  */
                const wimlib_tchar *cur_path;
                 * volume with ::WIMLIB_ADD_FLAG_NTFS, this path will be
                 * relative to the root of the NTFS volume.  */
                const wimlib_tchar *cur_path;


@@ -1280,7 +1280,7 @@ typedef int (*wimlib_iterate_lookup_table_callback_t)(const struct wimlib_resour
 /** @ingroup G_modifying_wims
  * @{ */
 
 /** @ingroup G_modifying_wims
  * @{ */
 

-/** Directly capture a NTFS volume rather than a generic directory.  This flag
+/** Directly capture an NTFS volume rather than a generic directory.  This flag

  * cannot be combined with ::WIMLIB_ADD_FLAG_DEREFERENCE or
  * ::WIMLIB_ADD_FLAG_UNIX_DATA.   */
 #define WIMLIB_ADD_FLAG_NTFS                   0x00000001
  * cannot be combined with ::WIMLIB_ADD_FLAG_DEREFERENCE or
  * ::WIMLIB_ADD_FLAG_UNIX_DATA.   */
 #define WIMLIB_ADD_FLAG_NTFS                   0x00000001


@@ -1444,10 +1444,10 @@ typedef int (*wimlib_iterate_lookup_table_callback_t)(const struct wimlib_resour
 /** @ingroup G_extracting_wims
  * @{ */
 
 /** @ingroup G_extracting_wims
  * @{ */
 

-/** Extract the image directly to a NTFS volume rather than a generic directory.
+/** Extract the image directly to an NTFS volume rather than a generic directory.

  * This mode is only available if wimlib was compiled with libntfs-3g support;
  * if not, ::WIMLIB_ERR_UNSUPPORTED will be returned.  In this mode, the
  * This mode is only available if wimlib was compiled with libntfs-3g support;
  * if not, ::WIMLIB_ERR_UNSUPPORTED will be returned.  In this mode, the

- * extraction target will be interpreted as the path to a NTFS volume image (as
+ * extraction target will be interpreted as the path to an NTFS volume image (as

  * a regular file or block device) rather than a directory.  It will be opened
  * using libntfs-3g, and the image will be extracted to the NTFS filesystem's
  * root directory.  Note: this flag cannot be used when wimlib_extract_image()
  * a regular file or block device) rather than a directory.  It will be opened
  * using libntfs-3g, and the image will be extracted to the NTFS filesystem's
  * root directory.  Note: this flag cannot be used when wimlib_extract_image()


@@ -3069,7 +3069,7 @@ wimlib_join(const wimlib_tchar * const *swms,
  * @return 0 on success; nonzero on error.
  *
  * @retval ::WIMLIB_ERR_ALREADY_LOCKED
  * @return 0 on success; nonzero on error.
  *
  * @retval ::WIMLIB_ERR_ALREADY_LOCKED

- *     A read-write mount was requested, but an an exclusive advisory lock on
+ *     A read-write mount was requested, but an exclusive advisory lock on

  *     the on-disk WIM file could not be acquired because another thread or
  *     process has mounted an image from the WIM read-write or is currently
  *     modifying the WIM in-place.
  *     the on-disk WIM file could not be acquired because another thread or
  *     process has mounted an image from the WIM read-write or is currently
  *     modifying the WIM in-place.


@@ -3905,7 +3905,7 @@ wimlib_unmount_image(const wimlib_tchar *dir,
  *     An unknown operation type was specified in the update commands; or,
  *     attempted to execute an add command where ::WIMLIB_ADD_FLAG_NTFS was set
  *     in the @p add_flags, but the same image had previously already been
  *     An unknown operation type was specified in the update commands; or,
  *     attempted to execute an add command where ::WIMLIB_ADD_FLAG_NTFS was set
  *     in the @p add_flags, but the same image had previously already been

- *     added from a NTFS volume; or, both ::WIMLIB_ADD_FLAG_RPFIX and
+ *     added from an NTFS volume; or, both ::WIMLIB_ADD_FLAG_RPFIX and

  *     ::WIMLIB_ADD_FLAG_NORPFIX were specified in the @p add_flags for one add
  *     command; or, ::WIMLIB_ADD_FLAG_NTFS or ::WIMLIB_ADD_FLAG_RPFIX were
  *     specified in the @p add_flags for an add command in which @p
  *     ::WIMLIB_ADD_FLAG_NORPFIX were specified in the @p add_flags for one add
  *     command; or, ::WIMLIB_ADD_FLAG_NTFS or ::WIMLIB_ADD_FLAG_RPFIX were
  *     specified in the @p add_flags for an add command in which @p

diff --git a/include/wimlib/dentry.h b/include/wimlib/dentry.h
index bdbd5f753ccde41c2fee16e9a1e02bde4347b598..548c0e50dc532aa75c30c5fe8c2bfbc8426e257f 100644 (file)
--- a/include/wimlib/dentry.h
+++ b/include/wimlib/dentry.h
@@ -23,7 +23,7 @@ struct wim_security_data;
  * tree for each image in the WIM.
  *
  * Note that this is a directory entry and not an inode.  Since NTFS allows hard
  * tree for each image in the WIM.
  *
  * Note that this is a directory entry and not an inode.  Since NTFS allows hard

- * links, it's possible for a NTFS inode to correspond to multiple WIM dentries.
+ * links, it's possible for an NTFS inode to correspond to multiple WIM dentries.

  * The hard link group ID field of the on-disk WIM dentry tells us the number of
  * the NTFS inode that the dentry corresponds to (and this gets placed in
  * d_inode->i_ino).
  * The hard link group ID field of the on-disk WIM dentry tells us the number of
  * the NTFS inode that the dentry corresponds to (and this gets placed in
  * d_inode->i_ino).


@@ -80,7 +80,7 @@ struct wim_dentry {
         * "skeleton" of the dentry has been extracted.  */
        u8 skeleton_extracted : 1;
 
         * "skeleton" of the dentry has been extracted.  */
        u8 skeleton_extracted : 1;
 

-       /* When capturing from a NTFS volume using NTFS-3g, this flag is set on
+       /* When capturing from an NTFS volume using NTFS-3g, this flag is set on

         * dentries that were created from a filename in the WIN32 or WIN32+DOS
         * namespaces rather than the POSIX namespace.  Otherwise this will
         * always be 0.  */
         * dentries that were created from a filename in the WIN32 or WIN32+DOS
         * namespaces rather than the POSIX namespace.  Otherwise this will
         * always be 0.  */

diff --git a/include/wimlib/inode.h b/include/wimlib/inode.h
index 04ec9682ad5886da5a55532401ba614e0e393b69..a3f38b74ea4a96a9b5b8b6d48fe9212359d89aa4 100644 (file)
--- a/include/wimlib/inode.h
+++ b/include/wimlib/inode.h
@@ -237,7 +237,7 @@ struct wim_ads_entry_on_disk {
        le16 stream_name_nbytes;
 
        /* Stream name in UTF-16LE.  It is @stream_name_nbytes bytes long,
        le16 stream_name_nbytes;
 
        /* Stream name in UTF-16LE.  It is @stream_name_nbytes bytes long,

-        * excluding the the null terminator.  There is a null terminator
+        * excluding the null terminator.  There is a null terminator

         * character if @stream_name_nbytes != 0; i.e., if this stream is named.
         * */
        utf16lechar stream_name[];
         * character if @stream_name_nbytes != 0; i.e., if this stream is named.
         * */
        utf16lechar stream_name[];

diff --git a/include/wimlib/lz_optimal.h b/include/wimlib/lz_optimal.h
index 95333db6b273851ec423337486f7e4ea45ac2b84..1e8419865fc7abe56c9b09402431690f08ebb405 100644 (file)
--- a/include/wimlib/lz_optimal.h
+++ b/include/wimlib/lz_optimal.h
@@ -256,7 +256,7 @@ typedef lz_mc_cost_t (*lz_get_match_cost_t)(LZ_COMPRESSOR *ctx,
  *
  * This is based on the algorithm used in 7-Zip's DEFLATE encoder, written by
  * Igor Pavlov.  However it also attempts to account for adaptive state, such as
  *
  * This is based on the algorithm used in 7-Zip's DEFLATE encoder, written by
  * Igor Pavlov.  However it also attempts to account for adaptive state, such as

- * a LRU queue of recent match offsets.
+ * an LRU queue of recent match offsets.

  *
  * Unlike a greedy parser that always takes the longest match, or even a "lazy"
  * parser with one match/literal look-ahead like zlib, the algorithm used here
  *
  * Unlike a greedy parser that always takes the longest match, or even a "lazy"
  * parser with one match/literal look-ahead like zlib, the algorithm used here

diff --git a/include/wimlib/lz_sarray.h b/include/wimlib/lz_sarray.h
index 30dc2b30a480ea64d943ab73e6baedf71bfa86f6..e609d0c2e79dbbcc93a668475ae0f4fa6a53d0dd 100644 (file)
--- a/include/wimlib/lz_sarray.h
+++ b/include/wimlib/lz_sarray.h
@@ -136,7 +136,7 @@ struct salink {
                struct {
                        /* Intially, the length, in bytes, of the longest common
                         * prefix (LCP) between the suffix having this rank and
                struct {
                        /* Intially, the length, in bytes, of the longest common
                         * prefix (LCP) between the suffix having this rank and

-                        * the suffix with the the smallest larger rank that
+                        * the suffix with the smallest larger rank that

                         * starts earlier in the window than the suffix having
                         * this rank.  If no such suffix exists, this will be 0.
                         *
                         * starts earlier in the window than the suffix having
                         * this rank.  If no such suffix exists, this will be 0.
                         *


@@ -150,7 +150,7 @@ struct salink {
 
                        /* Initially, the length, in bytes, of the longest
                         * common prefix (LCP) between the suffix having this
 
                        /* Initially, the length, in bytes, of the longest
                         * common prefix (LCP) between the suffix having this

-                        * rank and the suffix with the the largest smaller rank
+                        * rank and the suffix with the largest smaller rank

                         * that starts earlier in the window than the suffix
                         * having this rank.  If no such suffix exists, this
                         * will be 0.
                         * that starts earlier in the window than the suffix
                         * having this rank.  If no such suffix exists, this
                         * will be 0.


@@ -170,7 +170,7 @@ struct salink {
                         * distance to the rank of a suffix that is
                         * lexicographically closer to the current suffix than
                         * the desired suffix, but appears *later* in the window
                         * distance to the rank of a suffix that is
                         * lexicographically closer to the current suffix than
                         * the desired suffix, but appears *later* in the window

-                        * and hence cannot be used as the basis for a LZ77
+                        * and hence cannot be used as the basis for an LZ77

                         * match.  */
                        lz_sarray_delta_t dist_to_next;
 
                         * match.  */
                        lz_sarray_delta_t dist_to_next;
 


@@ -181,7 +181,7 @@ struct salink {
                         * distance to the rank of a suffix that is
                         * lexicographically closer to the current suffix than
                         * the desired suffix, but appears *later* in the window
                         * distance to the rank of a suffix that is
                         * lexicographically closer to the current suffix than
                         * the desired suffix, but appears *later* in the window

-                        * and hence cannot be used as the basis for a LZ77
+                        * and hence cannot be used as the basis for an LZ77

                         * match.  */
                        lz_sarray_delta_t dist_to_prev;
                };
                         * match.  */
                        lz_sarray_delta_t dist_to_prev;
                };

diff --git a/include/wimlib/lzx.h b/include/wimlib/lzx.h
index 715ec16bfefa62fef98ca43c07bd1964f7856c5c..1f4c1e3f9b77b5acf202dc40b6e2334fca67d2d0 100644 (file)
--- a/include/wimlib/lzx.h
+++ b/include/wimlib/lzx.h
@@ -95,7 +95,7 @@
 extern const u8 lzx_extra_bits[LZX_MAX_POSITION_SLOTS];
 #endif
 
 extern const u8 lzx_extra_bits[LZX_MAX_POSITION_SLOTS];
 #endif
 

-/* Given the number of a LZX position slot, return the number of extra bits that
+/* Given the number of an LZX position slot, return the number of extra bits that

  * are needed to encode the match offset. */
 static inline unsigned
 lzx_get_num_extra_bits(unsigned position_slot)
  * are needed to encode the match offset. */
 static inline unsigned
 lzx_get_num_extra_bits(unsigned position_slot)

diff --git a/programs/imagex.c b/programs/imagex.c
index 64a1d8d799f4c55bb95ecc100a985486831b7bd5..71289fbb075248a0fc1d472daee2ca409efeecb8 100644 (file)
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -1458,7 +1458,7 @@ parse_update_command_file(tchar **cmd_file_contents_p, size_t cmd_file_nchars,
 }
 
 /* Apply one image, or all images, from a WIM file to a directory, OR apply
 }
 
 /* Apply one image, or all images, from a WIM file to a directory, OR apply

- * one image from a WIM file to a NTFS volume.  */
+ * one image from a WIM file to an NTFS volume.  */

 static int
 imagex_apply(int argc, tchar **argv, int cmd)
 {
 static int
 imagex_apply(int argc, tchar **argv, int cmd)
 {


@@ -1588,7 +1588,7 @@ imagex_apply(int argc, tchar **argv, int cmd)
 
 #ifndef __WIN32__
        {
 
 #ifndef __WIN32__
        {

-               /* Interpret a regular file or block device target as a NTFS
+               /* Interpret a regular file or block device target as an NTFS

                 * volume.  */
                struct stat stbuf;
 
                 * volume.  */
                struct stat stbuf;
 


@@ -4149,7 +4149,7 @@ usage_all(FILE *fp)
 
 /* Entry point for wimlib's ImageX implementation.  On UNIX the command
  * arguments will just be 'char' strings (ideally UTF-8 encoded, but could be
 
 /* Entry point for wimlib's ImageX implementation.  On UNIX the command
  * arguments will just be 'char' strings (ideally UTF-8 encoded, but could be

- * something else), while an Windows the command arguments will be UTF-16LE
+ * something else), while on Windows the command arguments will be UTF-16LE

  * encoded 'wchar_t' strings. */
 int
 #ifdef __WIN32__
  * encoded 'wchar_t' strings. */
 int
 #ifdef __WIN32__

diff --git a/src/extract.c b/src/extract.c
index 36b6583cae60233f1975bcb34aa6fea36ea321da..a574f7c5af374d77f0cde3740f5743b0eb93b05a 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -2775,7 +2775,7 @@ check_extract_flags(const WIMStruct *wim, int *extract_flags_p)
 #ifndef WITH_NTFS_3G
        if (extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) {
                ERROR("wimlib was compiled without support for NTFS-3g, so\n"
 #ifndef WITH_NTFS_3G
        if (extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) {
                ERROR("wimlib was compiled without support for NTFS-3g, so\n"

-                     "        it cannot apply a WIM image directly to a NTFS volume.");
+                     "        it cannot apply a WIM image directly to an NTFS volume.");

                return WIMLIB_ERR_UNSUPPORTED;
        }
 #endif
                return WIMLIB_ERR_UNSUPPORTED;
        }
 #endif

diff --git a/src/inode_fixup.c b/src/inode_fixup.c
index d24157cd224d24f2cd8da6f2f636249c8ec7de53..2eb15a87d83d55e6c2cece223f475f58688f2746 100644 (file)
--- a/src/inode_fixup.c
+++ b/src/inode_fixup.c
@@ -474,7 +474,7 @@ dentry_tree_fix_inodes(struct wim_dentry *root, struct list_head *inode_list)
                }
        }
        /* On success, all the inodes have been moved to the image inode list,
                }
        }
        /* On success, all the inodes have been moved to the image inode list,

-        * so there's no need to delete from from the hash lists in the inode
+        * so there's no need to delete from the hash lists in the inode

         * table before freeing the hash buckets array directly. */
        ret = 0;
        goto out_destroy_inode_table_raw;
         * table before freeing the hash buckets array directly. */
        ret = 0;
        goto out_destroy_inode_table_raw;

diff --git a/src/lzms-compress.c b/src/lzms-compress.c
index b81de0528593b47637b94f1a1d7028c6a42555cc..64a674214b0766b17a6758650ed6558f38c4e2f6 100644 (file)
--- a/src/lzms-compress.c
+++ b/src/lzms-compress.c
@@ -534,7 +534,7 @@ lzms_encode_lz_match(struct lzms_compressor *ctx, u32 length, u32 offset)
        /* Main bit: 1 = a match, not a literal.  */
        lzms_range_encode_bit(&ctx->main_range_encoder, 1);
 
        /* Main bit: 1 = a match, not a literal.  */
        lzms_range_encode_bit(&ctx->main_range_encoder, 1);
 

-       /* Match bit: 0 = a LZ match, not a delta match.  */
+       /* Match bit: 0 = an LZ match, not a delta match.  */

        lzms_range_encode_bit(&ctx->match_range_encoder, 0);
 
        /* Determine if the offset can be represented as a recent offset.  */
        lzms_range_encode_bit(&ctx->match_range_encoder, 0);
 
        /* Determine if the offset can be represented as a recent offset.  */

diff --git a/src/lzms-decompress.c b/src/lzms-decompress.c
index b61b0e0fb7f25df131b519631efd13e445744105..1516e364d842f72059332430c5177353b40fd963 100644 (file)
--- a/src/lzms-decompress.c
+++ b/src/lzms-decompress.c
@@ -35,7 +35,7 @@
  * is a container format from which the locations and sizes (both compressed and
  * uncompressed) of the constituent blocks can be determined.
  *
  * is a container format from which the locations and sizes (both compressed and
  * uncompressed) of the constituent blocks can be determined.
  *

- * A LZMS-compressed block must be read in 16-bit little endian units from both
+ * An LZMS-compressed block must be read in 16-bit little endian units from both

  * directions.  One logical bitstream starts at the front of the block and
  * proceeds forwards.  Another logical bitstream starts at the end of the block
  * and proceeds backwards.  Bits read from the forwards bitstream constitute
  * directions.  One logical bitstream starts at the front of the block and
  * proceeds forwards.  Another logical bitstream starts at the end of the block
  * and proceeds backwards.  Bits read from the forwards bitstream constitute


@@ -65,7 +65,7 @@
  * offset is 1, regardless of match length.
  *
  * For LZ matches, up to 3 repeat offsets are allowed, similar to some other
  * offset is 1, regardless of match length.
  *
  * For LZ matches, up to 3 repeat offsets are allowed, similar to some other

- * LZ-based formats such as LZX and LZMA.  They must updated in a LRU fashion,
+ * LZ-based formats such as LZX and LZMA.  They must updated in an LRU fashion,

  * except for a quirk: updates to the queue must be delayed by one LZMS item,
  * except for the removal of a repeat match.  As a result, 4 entries are
  * actually needed in the queue, even though it is only possible to decode
  * except for a quirk: updates to the queue must be delayed by one LZMS item,
  * except for the removal of a repeat match.  As a result, 4 entries are
  * actually needed in the queue, even though it is only possible to decode


@@ -173,7 +173,7 @@
  * than 15 bits, then all frequencies must be divided by 2, rounding up, and the
  * code construction must be attempted again.
  *
  * than 15 bits, then all frequencies must be divided by 2, rounding up, and the
  * code construction must be attempted again.
  *

- * A LZMS-compressed block seemingly cannot have a compressed size greater than
+ * An LZMS-compressed block seemingly cannot have a compressed size greater than

  * or equal to the uncompressed size.  In such cases the block must be stored
  * uncompressed.
  *
  * or equal to the uncompressed size.  In such cases the block must be stored
  * uncompressed.
  *


@@ -232,7 +232,7 @@ struct lzms_input_bitstream {
         * at a time, this needs to be 64 bits rather than 32 bits.  */
        u64 bitbuf;
 
         * at a time, this needs to be 64 bits rather than 32 bits.  */
        u64 bitbuf;
 

-       /* Number of bits in @bitbuf that are are used.  */
+       /* Number of bits in @bitbuf that are used.  */

        unsigned num_filled_bits;
 
        /* Pointer to the one past the next little-endian 16-bit integer in the
        unsigned num_filled_bits;
 
        /* Pointer to the one past the next little-endian 16-bit integer in the


@@ -796,7 +796,7 @@ lzms_decode_delta_match(struct lzms_decompressor *ctx)
        return lzms_copy_delta_match(ctx, length, power, raw_offset);
 }
 
        return lzms_copy_delta_match(ctx, length, power, raw_offset);
 }
 

-/* Decode a LZ or delta match.  */
+/* Decode an LZ or delta match.  */

 static int
 lzms_decode_match(struct lzms_decompressor *ctx)
 {
 static int
 lzms_decode_match(struct lzms_decompressor *ctx)
 {


@@ -985,7 +985,7 @@ lzms_decompress(const void *compressed_data, size_t compressed_size,
                return -1;
        }
 
                return -1;
        }
 

-       /* A LZMS-compressed data block should be evenly divisible into 16-bit
+       /* An LZMS-compressed data block should be evenly divisible into 16-bit

         * integers.  */
        if (compressed_size % 2 != 0) {
                LZMS_DEBUG("Compressed size not divisible by 2 (got %zu)",
         * integers.  */
        if (compressed_size % 2 != 0) {
                LZMS_DEBUG("Compressed size not divisible by 2 (got %zu)",

diff --git a/src/lzx-decompress.c b/src/lzx-decompress.c
index 2405b9493ad9710f0476af9e2745fe8c59490b2f..05093266ce4bb4ce8e2406ec9b1c86998d09341c 100644 (file)
--- a/src/lzx-decompress.c
+++ b/src/lzx-decompress.c
@@ -26,7 +26,7 @@
  */
 
 /*
  */
 
 /*

- * LZX is a LZ77 and Huffman-code based compression format that has many
+ * LZX is an LZ77 and Huffman-code based compression format that has many

  * similarities to the DEFLATE format used in zlib.  The compression ratio is as
  * good or better than DEFLATE.
  *
  * similarities to the DEFLATE format used in zlib.  The compression ratio is as
  * good or better than DEFLATE.
  *


@@ -38,12 +38,12 @@
  * last decompress to a fixed number of bytes, by default 32768.  This is quite
  * similar to the cabinet (.cab) file format, but they are not the same.
  * According to the cabinet format documentation, the LZX block size is
  * last decompress to a fixed number of bytes, by default 32768.  This is quite
  * similar to the cabinet (.cab) file format, but they are not the same.
  * According to the cabinet format documentation, the LZX block size is

- * independent from the CFDATA blocks, and a LZX block may span several CFDATA
+ * independent from the CFDATA blocks, and an LZX block may span several CFDATA

  * blocks.  However, in WIMs, LZX blocks do not appear to ever span multiple WIM
  * chunks.  Note that this means any WIM chunk may be decompressed or compressed
  * independently from any other chunk, which allows random access.
  *
  * blocks.  However, in WIMs, LZX blocks do not appear to ever span multiple WIM
  * chunks.  Note that this means any WIM chunk may be decompressed or compressed
  * independently from any other chunk, which allows random access.
  *

- * A LZX compressed WIM chunk contains one or more LZX blocks of the aligned,
+ * An LZX compressed WIM chunk contains one or more LZX blocks of the aligned,

  * verbatim, or uncompressed block types.  For aligned and verbatim blocks, the
  * size of the block in uncompressed bytes is specified by a bit following the 3
  * bits that specify the block type, possibly followed by an additional 16 bits.
  * verbatim, or uncompressed block types.  For aligned and verbatim blocks, the
  * size of the block in uncompressed bytes is specified by a bit following the 3
  * bits that specify the block type, possibly followed by an additional 16 bits.


@@ -319,7 +319,7 @@ lzx_read_code_lens(struct input_bitstream *istream, u8 lens[],
  *                             in bytes, will be returned.
  * @block_type_ret:    A pointer to an int into which the type of the block
  *                             (LZX_BLOCKTYPE_*) will be returned.
  *                             in bytes, will be returned.
  * @block_type_ret:    A pointer to an int into which the type of the block
  *                             (LZX_BLOCKTYPE_*) will be returned.

- * @tables:            A pointer to a lzx_tables structure in which the
+ * @tables:            A pointer to an lzx_tables structure in which the

  *                             main tree, the length tree, and possibly the
  *                             aligned offset tree will be constructed.
  * @queue:     A pointer to the least-recently-used queue into which
  *                             main tree, the length tree, and possibly the
  *                             aligned offset tree will be constructed.
  * @queue:     A pointer to the least-recently-used queue into which


@@ -766,7 +766,7 @@ undo_call_insn_preprocessing(u8 *uncompressed_data, s32 uncompressed_size)
 }
 
 /*
 }
 
 /*

- * Decompresses a LZX-compressed block of data from which the header has already
+ * Decompresses an LZX-compressed block of data from which the header has already

  * been read.
  *
  * @block_type:        The type of the block (LZX_BLOCKTYPE_VERBATIM or
  * been read.
  *
  * @block_type:        The type of the block (LZX_BLOCKTYPE_VERBATIM or

diff --git a/src/ntfs-3g_apply.c b/src/ntfs-3g_apply.c
index 0d054edb922737d46247908ea33c16e237b94219..77dbb23bfd5da5dad379606a59daafe6644f20af 100644 (file)
--- a/src/ntfs-3g_apply.c
+++ b/src/ntfs-3g_apply.c
@@ -1,7 +1,7 @@
 /*
  * ntfs-3g_apply.c
  *
 /*
  * ntfs-3g_apply.c
  *

- * Apply a WIM image directly to a NTFS volume using libntfs-3g.  Restore as
+ * Apply a WIM image directly to an NTFS volume using libntfs-3g.  Restore as

  * much information as possible, including security data, file attributes, DOS
  * names, and alternate data streams.
  */
  * much information as possible, including security data, file attributes, DOS
  * names, and alternate data streams.
  */


@@ -199,7 +199,7 @@ out:
 }
 
 /*
 }
 
 /*

- * Extract a stream (default or alternate data) to an attribute of a NTFS file.
+ * Extract a stream (default or alternate data) to an attribute of an NTFS file.

  */
 static int
 ntfs_3g_extract_stream(file_spec_t file, const utf16lechar *raw_stream_name,
  */
 static int
 ntfs_3g_extract_stream(file_spec_t file, const utf16lechar *raw_stream_name,

diff --git a/src/ntfs-3g_capture.c b/src/ntfs-3g_capture.c
index ff341f09ddf02b2235ec55b3a242fc9ef313de39..5c5b97af81f4a46fd68cb3e822456da73561f832 100644 (file)
--- a/src/ntfs-3g_capture.c
+++ b/src/ntfs-3g_capture.c
@@ -1,7 +1,7 @@
 /*
  * ntfs-3g_capture.c
  *
 /*
  * ntfs-3g_capture.c
  *

- * Capture a WIM image directly from a NTFS volume using libntfs-3g.  We capture
+ * Capture a WIM image directly from an NTFS volume using libntfs-3g.  We capture

  * everything we can, including security data and alternate data streams.
  */
 
  * everything we can, including security data and alternate data streams.
  */
 


@@ -357,7 +357,7 @@ insert_dos_name(struct dos_name_map *map, const ntfschar *dos_name,
        if (avl_tree_insert(&map->root, &new_node->index_node,
                            _avl_cmp_by_ntfs_ino))
        {
        if (avl_tree_insert(&map->root, &new_node->index_node,
                            _avl_cmp_by_ntfs_ino))
        {

-               /* This should be impossible since a NTFS inode cannot
+               /* This should be impossible since an NTFS inode cannot

                 * have multiple DOS names, and we only should get each
                 * DOS name entry once from the ntfs_readdir() calls. */
                ERROR("NTFS inode %"PRIu64" has multiple DOS names",
                 * have multiple DOS names, and we only should get each
                 * DOS name entry once from the ntfs_readdir() calls. */
                ERROR("NTFS inode %"PRIu64" has multiple DOS names",


@@ -369,7 +369,7 @@ insert_dos_name(struct dos_name_map *map, const ntfschar *dos_name,
        return 0;
 }
 
        return 0;
 }
 

-/* Returns a structure that contains the DOS name and its length for a NTFS
+/* Returns a structure that contains the DOS name and its length for an NTFS

  * inode, or NULL if the inode has no DOS name. */
 static struct dos_name_node *
 lookup_dos_name(const struct dos_name_map *map, u64 ntfs_ino)
  * inode, or NULL if the inode has no DOS name. */
 static struct dos_name_node *
 lookup_dos_name(const struct dos_name_map *map, u64 ntfs_ino)


@@ -516,7 +516,7 @@ out:
        return ret;
 }
 
        return ret;
 }
 

-/* Recursively build a WIM dentry tree corresponding to a NTFS volume.
+/* Recursively build a WIM dentry tree corresponding to an NTFS volume.

  * At the same time, update the WIM lookup table with lookup table entries for
  * the NTFS streams, and build an array of security descriptors.
  */
  * At the same time, update the WIM lookup table with lookup table entries for
  * the NTFS streams, and build an array of security descriptors.
  */

diff --git a/src/security.c b/src/security.c
index 12cfcb4ce6ee5c3e335059472133558e92a7205c..6348918ac5f20407ac2efc4b174444eceda0d67e 100644 (file)
--- a/src/security.c
+++ b/src/security.c
@@ -275,7 +275,7 @@ _avl_cmp_nodes_by_hash(const struct avl_tree_node *n1,
        return hashes_cmp(SD_NODE(n1)->hash, SD_NODE(n2)->hash);
 }
 
        return hashes_cmp(SD_NODE(n1)->hash, SD_NODE(n2)->hash);
 }
 

-/* Inserts a a new node into the security descriptor index tree.  Returns true
+/* Inserts a new node into the security descriptor index tree.  Returns true

  * if successful (not a duplicate).  */
 static bool
 insert_sd_node(struct wim_sd_set *set, struct sd_node *new)
  * if successful (not a duplicate).  */
 static bool
 insert_sd_node(struct wim_sd_set *set, struct sd_node *new)

diff --git a/src/update_image.c b/src/update_image.c
index cda3797d53350f36c3cfc84c1155ee591c508847..14f316366c74951939660366cf3c07d715fcf282 100644 (file)
--- a/src/update_image.c
+++ b/src/update_image.c
@@ -1266,7 +1266,7 @@ check_add_command(struct wimlib_update_command *cmd,
 
        if (!is_entire_image) {
                if (add_flags & WIMLIB_ADD_FLAG_NTFS) {
 
        if (!is_entire_image) {
                if (add_flags & WIMLIB_ADD_FLAG_NTFS) {

-                       ERROR("Cannot add directly from a NTFS volume "
+                       ERROR("Cannot add directly from an NTFS volume "

                              "when not capturing a full image!");
                        return WIMLIB_ERR_INVALID_PARAM;
                }
                              "when not capturing a full image!");
                        return WIMLIB_ERR_INVALID_PARAM;
                }

diff --git a/src/write.c b/src/write.c
index 25827b7cefc07cbb78bbe2fe951d3dc4e5a0f518..ae1754803628f8f2f433568d05453fba28444ed6 100644 (file)
--- a/src/write.c
+++ b/src/write.c
@@ -1925,7 +1925,7 @@ filter_stream_list_for_write(struct list_head *stream_list,
  *     @stream_list_ret.
  *
  *     SKIP_EXTERNAL_WIMS:  Streams already present in a WIM file, but not
  *     @stream_list_ret.
  *
  *     SKIP_EXTERNAL_WIMS:  Streams already present in a WIM file, but not

- *     @wim, shall be be returned in neither @stream_list_ret nor
+ *     @wim, shall be returned in neither @stream_list_ret nor

  *     @lookup_table_list_ret.
  *
  * @stream_list_ret
  *     @lookup_table_list_ret.
  *
  * @stream_list_ret


@@ -2968,7 +2968,7 @@ check_resource_offsets(WIMStruct *wim, off_t end_offset)
  *                   Integrity table (optional) (variable size)
  *
  * This method allows an image to be appended to a large WIM very quickly, and
  *                   Integrity table (optional) (variable size)
  *
  * This method allows an image to be appended to a large WIM very quickly, and

- * is is crash-safe except in the case of write re-ordering, but the
+ * is crash-safe except in the case of write re-ordering, but the

  * disadvantage is that a small hole is left in the WIM where the old lookup
  * table, xml data, and integrity table were.  (These usually only take up a
  * small amount of space compared to the streams, however.)
  * disadvantage is that a small hole is left in the WIM where the old lookup
  * table, xml data, and integrity table were.  (These usually only take up a
  * small amount of space compared to the streams, however.)

diff --git a/src/xpress-decompress.c b/src/xpress-decompress.c
index c24a1e66d8d2c574e03897089cb3015f258b9252..233e9355b221f65e2c4baad947fb0af6aae21c9c 100644 (file)
--- a/src/xpress-decompress.c
+++ b/src/xpress-decompress.c
@@ -133,7 +133,7 @@ xpress_decode_match(unsigned sym, input_idx_t window_pos,
        match_len += XPRESS_MIN_MATCH_LEN;
 
 
        match_len += XPRESS_MIN_MATCH_LEN;
 
 

-       /* Verify the match is in bounds, then copy its data to the the current
+       /* Verify the match is in bounds, then copy its data to the current

         * position.  */
 
        if (window_pos + match_len > window_len)
         * position.  */
 
        if (window_pos + match_len > window_len)

diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs
index 306334946bb4e406df4fdf6927ffb713e30ff5c5..ebdb861b677dcff8150ea61fdd6fe051fe5f194e 100755 (executable)
--- a/tests/test-imagex-ntfs
+++ b/tests/test-imagex-ntfs
@@ -43,12 +43,12 @@ __do_mount() {
        if ! ntfs-3g -o "no_def_opts,silent" $1 $2; then
                if [ $UID -ne 0 ] && [ "$3" = "nofail" ]; then
                        echo "WARNING: skipping NTFS tests because we aren't able to "
        if ! ntfs-3g -o "no_def_opts,silent" $1 $2; then
                if [ $UID -ne 0 ] && [ "$3" = "nofail" ]; then
                        echo "WARNING: skipping NTFS tests because we aren't able to "

-                       echo "mount a NTFS volume (perhaps ntfs-3g is not installed setuid root?)"
+                       echo "mount an NTFS volume (perhaps ntfs-3g is not installed setuid root?)"

                        skip_test
                else
                        error "Could not mount NTFS volume \"$1\" on \"$2\"!  Make sure ntfs-3g is "\
                              "installed, and that you are either running the tests as root or have ntfs-3g "\
                        skip_test
                else
                        error "Could not mount NTFS volume \"$1\" on \"$2\"!  Make sure ntfs-3g is "\
                              "installed, and that you are either running the tests as root or have ntfs-3g "\

-                             "installed setuid root, so that we can mount a NTFS volume."
+                             "installed setuid root, so that we can mount an NTFS volume."

                fi
        fi
 }
                fi
        fi
 }


@@ -101,7 +101,7 @@ do_test() {
                        echo "Dumping tree of applied image"
                        tree out.mnt --inodes -F -s --noreport
                        error 'Information was lost or corrupted while capturing
                        echo "Dumping tree of applied image"
                        tree out.mnt --inodes -F -s --noreport
                        error 'Information was lost or corrupted while capturing

-                               and then applying a NTFS volume'
+                               and then applying an NTFS volume'

                fi
        fi
        rm -rf out.mnt/* in.mnt/*
                fi
        fi
        rm -rf out.mnt/* in.mnt/*