Improve wording

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e1a934c8ed775a00f92c41268e14933747875d0..8c8a86cb5f2b20b975205eeef0f1b6dd568fe44d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1016,8 +1016,8 @@ 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 warning which success is a miss
-      # detection. So this needs for all build mode(even it's a release mode).
+      # success of iconv detection with a warning, which would be a false
+      # positive.  So this is needed for all build modes, even in release mode.
       #
       SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror")
     ENDIF (CMAKE_C_COMPILER_ID MATCHES "^GNU$" OR

diff --git a/README.md b/README.md
index 0d63357292ec932aab47258f48e29de087d7463b..e9691f1b710b925b7b983b5c57373a2c028065ac 100644 (file)
--- a/README.md
+++ b/README.md
@@ -191,7 +191,7 @@ questions we are asked about libarchive:
   libraries.  This also reduces the size of statically-linked
   binaries in environments where that matters.
 
-* The library is generally _thread safe_ depending on the platform:
+* The library is generally _thread-safe_ depending on the platform:
   it does not define any global variables of its own.  However, some
   platforms do not provide fully thread-safe versions of key C library
   functions.  On those platforms, libarchive will use the non-thread-safe
@@ -214,7 +214,7 @@ questions we are asked about libarchive:
   multiple threads.  Of course, those modules are completely
   optional and you can use the rest of libarchive without them.
 
-* The library is _not_ thread aware, however.  It does no locking
+* The library is _not_ thread-aware, however.  It does no locking
   or thread management of any kind.  If you create a libarchive
   object and need to access it from multiple threads, you will
   need to provide your own locking.

diff --git a/libarchive/archive_read_support_filter_uu.c b/libarchive/archive_read_support_filter_uu.c
index d722fe343657e4d2fd9dc627ffd26b12d5c04e7b..acb8feb79b2d68688a6391469c280c62d5ece54e 100644 (file)
--- a/libarchive/archive_read_support_filter_uu.c
+++ b/libarchive/archive_read_support_filter_uu.c
@@ -232,8 +232,8 @@ bid_get_line(struct archive_read_filter *filter,
                size_t nbytes_req = (*ravail+1023) & ~1023U;
                ssize_t tested;
 
-               /* Increase reading bytes if it is not enough to at least
-                * new two lines. */
+               /* Increase reading bytes if it is not enough for at least
+                * two new lines. */
                if (nbytes_req < (size_t)*ravail + 160)
                        nbytes_req <<= 1;
 
@@ -411,7 +411,7 @@ ensure_in_buff_size(struct archive_read_filter *self,
 
                /*
                 * Calculate a new buffer size for in_buff.
-                * Increase its value until it has enough size we need.
+                * Increase its value until it is enough for our needs.
                 */
                newsize = uudecode->in_allocated;
                do {
@@ -494,7 +494,7 @@ read_more:
                }
                /*
                 * If there is remaining data which is saved by
-                * previous calling, use it first.
+                * a previous call, use it first.
                 */
                if (ensure_in_buff_size(self, uudecode,
                    avail_in + uudecode->in_cnt) != ARCHIVE_OK)

diff --git a/libarchive/archive_read_support_format_cpio.c b/libarchive/archive_read_support_format_cpio.c
index 74f3549d159ec985eac50dc8b10a623a2dfae6cf..526096b39f75e6f6ecc5687980778d8309917e0d 100644 (file)
--- a/libarchive/archive_read_support_format_cpio.c
+++ b/libarchive/archive_read_support_format_cpio.c
@@ -825,9 +825,9 @@ header_odc(struct archive_read *a, struct cpio *cpio,
 }
 
 /*
- * NOTE: if a filename suffix is ".z", it is the file gziped by afio.
- * it would be nice that we can show uncompressed file size and we can
- * uncompressed file contents automatically, unfortunately we have nothing
+ * NOTE: if a filename suffix is ".z", it is a file gzipped by afio.
+ * it would be nice if we could show uncompressed file size and
+ * uncompress file contents automatically, unfortunately we have nothing
  * to get a uncompressed file size while reading each header. It means
  * we also cannot uncompress file contents under our framework.
  */

diff --git a/libarchive/archive_read_support_format_mtree.c b/libarchive/archive_read_support_format_mtree.c
index 96d2c71f4c4f4856fe9f9765465e9dd358156640..10c07b05d965b5d785f9c7d66cff6decb494b9e9 100644 (file)
--- a/libarchive/archive_read_support_format_mtree.c
+++ b/libarchive/archive_read_support_format_mtree.c
@@ -392,8 +392,8 @@ next_line(struct archive_read *a,
                if (len >= MAX_LINE_LEN)
                        return (-1);
 
-               /* Increase reading bytes if it is not enough to at least
-                * new two lines. */
+               /* Increase reading bytes if it is not enough for at least
+                * two new lines. */
                if (nbytes_req < (size_t)*ravail + 160)
                        nbytes_req <<= 1;
 
@@ -568,8 +568,8 @@ bid_keyword_list(const char *p,  ssize_t len, int unset, int last_is_path)
                                --len;
                                value = 1;
                        }
-                       /* A keyword should have a its value unless
-                        * "/unset" operation. */ 
+                       /* A keyword should have a value unless this is
+                        * an "/unset" operation. */ 
                        if (!unset && value == 0)
                                return (-1);
                }
@@ -752,7 +752,7 @@ detect_form(struct archive_read *a, int *is_form_d)
                                } else if (form_D == 1) {
                                        if (!last_is_path && keywords > 0)
                                                /* This this is not `form D'
-                                                * and We cannot accept mixed
+                                                * and we cannot accept mixed
                                                 * format. */
                                                break;
                                }
@@ -805,7 +805,7 @@ detect_form(struct archive_read *a, int *is_form_d)
  * to read the entire mtree file into memory up front.
  *
  * The parsing is done in two steps.  First, it is decided if a line
- * changes the global defaults and if it is, processed accordingly.
+ * changes the global defaults and if it does, it is processed accordingly.
  * Otherwise, the options of the line are merged with the current
  * global options.
  */

diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
index 740308b6e4e3e6cf3eb859e8015c152507f6d9de..a776dc85c688b8f265aa7d11e6460b8df8a11614 100644 (file)
--- a/libarchive/archive_string.c
+++ b/libarchive/archive_string.c
@@ -3573,7 +3573,7 @@ win_strncat_from_utf16(struct archive_string *as, const void *_p, size_t bytes,
 
        if (sc->to_cp == CP_C_LOCALE) {
                /*
-                * "C" locale special process.
+                * "C" locale special processing.
                 */
                u16 = _p;
                ll = 0;
@@ -3690,7 +3690,7 @@ win_strncat_to_utf16(struct archive_string *as16, const void *_p,
        avail = as16->buffer_length - 2;
        if (sc->from_cp == CP_C_LOCALE) {
                /*
-                * "C" locale special process.
+                * "C" locale special processing.
                 */
                count = 0;
                while (count < length && *s) {

diff --git a/libarchive/test/test_compat_lzip.c b/libarchive/test/test_compat_lzip.c
index 50920eefb1cf52de26f88ce763aec3d891fa87cb..cd246b943b22461f43e575cb8a47f71ebd0ba647 100644 (file)
--- a/libarchive/test/test_compat_lzip.c
+++ b/libarchive/test/test_compat_lzip.c
@@ -47,7 +47,7 @@ echo "f3" > $dir/d1/f3
 rm -r $dir
 }
 #
-# Make a lzip file from split tar file.
+# Make a lzip file from the split tar file.
 #
 name=test_compat_lzip_1
 dir="$name`date +%Y%m%d%H%M%S`.$USER"
@@ -75,7 +75,7 @@ exit 0
 */
 
 /*
- * Verify our ability to read sample files compatibly with lzip.
+ * Verify our ability to read the sample files compatibly with lzip.
  *
  * In particular:
  *  * lzip will read multiple lzip streams, concatenating the output