diff options
| author | Pedro F. Giffuni <pfg@FreeBSD.org> | 2017-02-17 19:53:20 +0000 |
|---|---|---|
| committer | Pedro F. Giffuni <pfg@FreeBSD.org> | 2017-02-17 19:53:20 +0000 |
| commit | 759a9a9d24cb22e3a6135e67df9b43567f802333 (patch) | |
| tree | 8414f4b01a2d12c626a23643f3696b408b939b97 /usr.bin/sort | |
| parent | 109e2d29ccf066c97788d13126652e7a0ad68cee (diff) | |
| download | src-759a9a9d24cb22e3a6135e67df9b43567f802333.tar.gz src-759a9a9d24cb22e3a6135e67df9b43567f802333.zip | |
Notes
Diffstat (limited to 'usr.bin/sort')
| -rw-r--r-- | usr.bin/sort/bwstring.c | 3 | ||||
| -rw-r--r-- | usr.bin/sort/coll.c | 3 | ||||
| -rw-r--r-- | usr.bin/sort/file.c | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/usr.bin/sort/bwstring.c b/usr.bin/sort/bwstring.c index 5ece88e69d45..b665d585f179 100644 --- a/usr.bin/sort/bwstring.c +++ b/usr.bin/sort/bwstring.c @@ -268,7 +268,7 @@ bwscsbdup(const unsigned char *str, size_t len) const char *s; size_t charlen, chars, cptr; - charlen = chars = 0; + chars = 0; cptr = 0; s = (const char *) str; @@ -581,7 +581,6 @@ bwsncmp(const struct bwstring *bws1, const struct bwstring *bws2, size_t cmp_len, len1, len2; int res = 0; - cmp_len = 0; len1 = bws1->len; len2 = bws2->len; diff --git a/usr.bin/sort/coll.c b/usr.bin/sort/coll.c index 6372f3d8aa7a..80631cdb9fb6 100644 --- a/usr.bin/sort/coll.c +++ b/usr.bin/sort/coll.c @@ -330,8 +330,6 @@ find_field_end(const struct bwstring *s, struct key_specs *ks) size_t f2, next_field_start, pos_end; bool empty_field, empty_key; - pos_end = 0; - next_field_start = 0; empty_field = false; empty_key = false; f2 = ks->f2; @@ -827,7 +825,6 @@ numcoll_impl(struct key_value *kv1, struct key_value *kv2, main1 = main2 = 0; frac1 = frac2 = 0; - cmp_res = 0; key1_read = key2_read = false; if (debug_sort) { diff --git a/usr.bin/sort/file.c b/usr.bin/sort/file.c index 47d59af5b1dd..1c2f60e1651f 100644 --- a/usr.bin/sort/file.c +++ b/usr.bin/sort/file.c @@ -631,7 +631,6 @@ file_reader_init(const char *fsrc) int fd, flags; flags = MAP_NOCORE | MAP_NOSYNC; - addr = MAP_FAILED; fd = open(fsrc, O_RDONLY); if (fd < 0) |