svn commit: r313891 - head/usr.bin/sort

[Pedro F. Giffuni]

Author: pfg
Date: Fri Feb 17 19:53:20 2017
New Revision: 313891
URL: https://svnweb.freebsd.org/changeset/base/313891

Log:
  sort(1): Remove unneeded initializations.
  
  Found by:	Clang static analyzer

Modified:
  head/usr.bin/sort/bwstring.c
  head/usr.bin/sort/coll.c
  head/usr.bin/sort/file.c

Modified: head/usr.bin/sort/bwstring.c
==============================================================================
--- head/usr.bin/sort/bwstring.c	Fri Feb 17 19:39:31 2017	(r313890)
+++ head/usr.bin/sort/bwstring.c	Fri Feb 17 19:53:20 2017	(r313891)
@@ -268,7 +268,7 @@ bwscsbdup(const unsigned char *str, size
 			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, con
 	size_t cmp_len, len1, len2;
 	int res = 0;
 
-	cmp_len = 0;
 	len1 = bws1->len;
 	len2 = bws2->len;
 

Modified: head/usr.bin/sort/coll.c
==============================================================================
--- head/usr.bin/sort/coll.c	Fri Feb 17 19:39:31 2017	(r313890)
+++ head/usr.bin/sort/coll.c	Fri Feb 17 19:53:20 2017	(r313891)
@@ -330,8 +330,6 @@ find_field_end(const struct bwstring *s,
 	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, stru
 	main1 = main2 = 0;
 	frac1 = frac2 = 0;
 
-	cmp_res = 0;
 	key1_read = key2_read = false;
 
 	if (debug_sort) {

Modified: head/usr.bin/sort/file.c
==============================================================================
--- head/usr.bin/sort/file.c	Fri Feb 17 19:39:31 2017	(r313890)
+++ head/usr.bin/sort/file.c	Fri Feb 17 19:53:20 2017	(r313891)
@@ -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)