aboutsummaryrefslogtreecommitdiff
path: root/src/liblzma
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2009-09-12 14:07:36 +0300
committerLasse Collin <lasse.collin@tukaani.org>2009-09-12 14:07:36 +0300
commit4ab7b16b9573bdfa32279e4adadff684d5cd58ac (patch)
tree74e02de3509688ea7651b5c1c2b2a20ebbc83d7a /src/liblzma
parentUpdated THANKS. (diff)
downloadxz-4ab7b16b9573bdfa32279e4adadff684d5cd58ac.tar.xz
A few grammar fixes.
Thanks to Christian Weisgerber for pointing out some of these.
Diffstat (limited to 'src/liblzma')
-rw-r--r--src/liblzma/api/lzma.h4
-rw-r--r--src/liblzma/api/lzma/vli.h4
-rw-r--r--src/liblzma/common/block_header_encoder.c2
-rw-r--r--src/liblzma/common/filter_common.c2
-rw-r--r--src/liblzma/lz/lz_encoder.h10
5 files changed, 11 insertions, 11 deletions
diff --git a/src/liblzma/api/lzma.h b/src/liblzma/api/lzma.h
index 44de60a1..9d28c28c 100644
--- a/src/liblzma/api/lzma.h
+++ b/src/liblzma/api/lzma.h
@@ -95,8 +95,8 @@
/* Use the standard inttypes.h. */
# ifdef __cplusplus
/*
- * C99 sections 7.18.2 and 7.18.4 specify that
- * in C++ implementations define the limit
+ * C99 sections 7.18.2 and 7.18.4 specify
+ * that C++ implementations define the limit
* and constant macros only if specifically
* requested. Note that if you want the
* format macros (PRIu64 etc.) too, you need
diff --git a/src/liblzma/api/lzma/vli.h b/src/liblzma/api/lzma/vli.h
index f002c775..f30e8210 100644
--- a/src/liblzma/api/lzma/vli.h
+++ b/src/liblzma/api/lzma/vli.h
@@ -10,8 +10,8 @@
* number of bytes required to represent the given value. Encodings that use
* non-minimum number of bytes are invalid, thus every integer has exactly
* one encoded representation. The maximum number of bits in a VLI is 63,
- * thus the vli argument must be at maximum of UINT64_MAX / 2. You should
- * use LZMA_VLI_MAX for clarity.
+ * thus the vli argument must be less than or equal to UINT64_MAX / 2. You
+ * should use LZMA_VLI_MAX for clarity.
*/
/*
diff --git a/src/liblzma/common/block_header_encoder.c b/src/liblzma/common/block_header_encoder.c
index 8bef63b5..bc1a10f8 100644
--- a/src/liblzma/common/block_header_encoder.c
+++ b/src/liblzma/common/block_header_encoder.c
@@ -110,7 +110,7 @@ lzma_block_header_encode(const lzma_block *block, uint8_t *out)
size_t filter_count = 0;
do {
- // There can be at maximum of four filters.
+ // There can be a maximum of four filters.
if (filter_count == LZMA_FILTERS_MAX)
return LZMA_PROG_ERROR;
diff --git a/src/liblzma/common/filter_common.c b/src/liblzma/common/filter_common.c
index ca1196aa..4762460a 100644
--- a/src/liblzma/common/filter_common.c
+++ b/src/liblzma/common/filter_common.c
@@ -155,7 +155,7 @@ validate_chain(const lzma_filter *filters, size_t *count)
} while (filters[++i].id != LZMA_VLI_UNKNOWN);
// There must be 1-4 filters. The last filter must be usable as
- // the last filter in the chain. At maximum of three filters are
+ // the last filter in the chain. A maximum of three filters are
// allowed to change the size of the data.
if (i > LZMA_FILTERS_MAX || !last_ok || changes_size_count > 3)
return LZMA_OPTIONS_ERROR;
diff --git a/src/liblzma/lz/lz_encoder.h b/src/liblzma/lz/lz_encoder.h
index 35e9ebbf..e7d3f875 100644
--- a/src/liblzma/lz/lz_encoder.h
+++ b/src/liblzma/lz/lz_encoder.h
@@ -143,7 +143,7 @@ typedef struct {
/// maximum possible length.
size_t match_len_max;
- /// Match finder will search matches of at maximum of this length.
+ /// Match finder will search matches up to this length.
/// This must be less than or equal to match_len_max.
size_t nice_len;
@@ -170,9 +170,9 @@ typedef struct {
// also take longer.
//
// A single encoder loop in the LZ-based encoder may call the match finder
-// (mf_find() or mf_skip()) at maximum of after_size times.
-// In other words, a single encoder loop may advance lzma_mf.read_pos at
-// maximum of after_size times. Since matches are looked up to
+// (mf_find() or mf_skip()) at most after_size times. In other words,
+// a single encoder loop may increment lzma_mf.read_pos at most after_size
+// times. Since matches are looked up to
// lzma_mf.buffer[lzma_mf.read_pos + match_len_max - 1], the total
// amount of extra buffer needed after dict_size becomes
// after_size + match_len_max.
@@ -270,7 +270,7 @@ mf_skip(lzma_mf *mf, uint32_t amount)
}
-/// Copies at maximum of *left amount of bytes from the history buffer
+/// Copies at most *left number of bytes from the history buffer
/// to out[]. This is needed by LZMA2 to encode uncompressed chunks.
static inline void
mf_read(lzma_mf *mf, uint8_t *out, size_t *out_pos, size_t out_size,