fix assorted unused code and wrong format specs found by cppchekc (bug 6716)

Denys Vlasenko · Denys Vlasenko · commit 9b2a9f0210f1 · 2013-11-29T16:43:33.000+01:00
Signed-off-by: Denys Vlasenko &lt;vda.linux@googlemail.com&gt;
diff --git a/archival/libarchive/bz/compress.c b/archival/libarchive/bz/compress.c
@@ -249,7 +249,7 @@ void generateMTFValues(EState* s)
 static NOINLINE
 void sendMTFValues(EState* s)
 {
-	int32_t v, t, i, j, gs, ge, totc, bt, bc, iter;
+	int32_t v, t, i, j, gs, ge, bt, bc, iter;
 	int32_t nSelectors, alphaSize, minLen, maxLen, selCtr;
 	int32_t nGroups;
 
@@ -345,7 +345,6 @@ void sendMTFValues(EState* s)
 		}
 #endif
 		nSelectors = 0;
-		totc = 0;
 		gs = 0;
 		while (1) {
 			/*--- Set group start & end marks. --*/
@@ -411,7 +410,6 @@ void sendMTFValues(EState* s)
 					bt = t;
 				}
 			}
-			totc += bc;
 			fave[bt]++;
 			s->selector[nSelectors] = bt;
 			nSelectors++;
diff --git a/archival/libarchive/decompress_bunzip2.c b/archival/libarchive/decompress_bunzip2.c
@@ -818,7 +818,6 @@ static char *const bunzip_errors[] = {
 /* Dumb little test thing, decompress stdin to stdout */
 int main(int argc, char **argv)
 {
-	int i;
 	char c;
 
 	int i = unpack_bz2_stream(0, 1);
diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c
@@ -336,7 +336,7 @@ static int huft_build(const unsigned *b, const unsigned n,
 	}
 
 	/* Find minimum and maximum length, bound *m by those */
-	for (j = 1; (c[j] == 0) && (j <= BMAX); j++)
+	for (j = 1; (j <= BMAX) && (c[j] == 0); j++)
 		continue;
 	k = j; /* minimum code length */
 	for (i = BMAX; (c[i] == 0) && i; i--)
diff --git a/archival/libarchive/lzo1x_9x.c b/archival/libarchive/lzo1x_9x.c
@@ -466,7 +466,6 @@ static int find_match(lzo1x_999_t *c, lzo_swd_p s,
 	}
 
 	s->m_len = 1;
-	s->m_len = 1;
 #ifdef SWD_BEST_OFF
 	if (s->use_best_off)
 		memset(s->best_pos, 0, sizeof(s->best_pos));
diff --git a/e2fsprogs/old_e2fsprogs/blkid/blkidP.h b/e2fsprogs/old_e2fsprogs/blkid/blkidP.h
@@ -179,8 +179,4 @@ extern int blkid_set_tag(blkid_dev dev, const char *name,
 extern blkid_dev blkid_new_dev(void);
 extern void blkid_free_dev(blkid_dev dev);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/e2fsprogs/old_e2fsprogs/blkid/cache.c b/e2fsprogs/old_e2fsprogs/blkid/cache.c
@@ -115,7 +115,7 @@ int main(int argc, char** argv)
 			argv[0], ret);
 		exit(1);
 	}
-	if ((ret = blkid_probe_all(cache) < 0))
+	if ((ret = blkid_probe_all(cache)) < 0)
 		fprintf(stderr, "error probing devices\n");
 
 	blkid_put_cache(cache);
diff --git a/e2fsprogs/old_e2fsprogs/blkid/dev.c b/e2fsprogs/old_e2fsprogs/blkid/dev.c
@@ -153,7 +153,7 @@ extern int optind;
 void usage(char *prog)
 {
 	fprintf(stderr, "Usage: %s [-f blkid_file] [-m debug_mask]\n", prog);
-	fprintf(stderr, "\tList all devices and exit\n", prog);
+	fprintf(stderr, "\tList all devices and exit\n");
 	exit(1);
 }
 
@@ -176,7 +176,7 @@ int main(int argc, char **argv)
 		case 'm':
 			blkid_debug_mask = strtoul (optarg, &tmp, 0);
 			if (*tmp) {
-				fprintf(stderr, "Invalid debug mask: %d\n",
+				fprintf(stderr, "Invalid debug mask: %s\n",
 					optarg);
 				exit(1);
 			}
diff --git a/e2fsprogs/old_e2fsprogs/blkid/read.c b/e2fsprogs/old_e2fsprogs/blkid/read.c
@@ -385,7 +385,7 @@ void blkid_read_cache(blkid_cache cache)
 			continue;
 		end = strlen(buf) - 1;
 		/* Continue reading next line if it ends with a backslash */
-		while (buf[end] == '\\' && end < sizeof(buf) - 2 &&
+		while (end < sizeof(buf) - 2 && buf[end] == '\\' &&
 		       fgets(buf + end, sizeof(buf) - end, file)) {
 			end = strlen(buf) - 1;
 			lineno++;
diff --git a/e2fsprogs/old_e2fsprogs/blkid/tag.c b/e2fsprogs/old_e2fsprogs/blkid/tag.c
@@ -356,7 +356,7 @@ void usage(char *prog)
 	fprintf(stderr, "Usage: %s [-f blkid_file] [-m debug_mask] device "
 		"[type value]\n",
 		prog);
-	fprintf(stderr, "\tList all tags for a device and exit\n", prog);
+	fprintf(stderr, "\tList all tags for a device and exit\n");
 	exit(1);
 }
 
@@ -382,7 +382,7 @@ int main(int argc, char **argv)
 		case 'm':
 			blkid_debug_mask = strtoul (optarg, &tmp, 0);
 			if (*tmp) {
-				fprintf(stderr, "Invalid debug mask: %d\n",
+				fprintf(stderr, "Invalid debug mask: %s\n",
 					optarg);
 				exit(1);
 			}
@@ -407,7 +407,7 @@ int main(int argc, char **argv)
 
 	dev = blkid_get_dev(cache, devname, flags);
 	if (!dev) {
-		fprintf(stderr, "%s: cannot find device in blkid cache\n");
+		fprintf(stderr, "%s: cannot find device in blkid cache\n", devname);
 		exit(1);
 	}
 	if (search_type) {
diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.c b/e2fsprogs/old_e2fsprogs/e2fsck.c
@@ -1050,7 +1050,7 @@ static errcode_t ea_refcount_create(int size, ext2_refcount_t *ret)
 	refcount->size = size;
 	bytes = (size_t) (size * sizeof(struct ea_refcount_el));
 #ifdef DEBUG
-	printf("Refcount allocated %d entries, %d bytes.\n",
+	printf("Refcount allocated %d entries, %lu bytes.\n",
 	       refcount->size, bytes);
 #endif
 	retval = ext2fs_get_mem(bytes, &refcount->list);
@@ -3424,7 +3424,7 @@ static void e2fsck_pass1(e2fsck_t ctx)
 				continue;
 			}
 			if ((inode->i_links_count || inode->i_blocks ||
-			     inode->i_blocks || inode->i_block[0]) &&
+			     inode->i_block[0]) &&
 			    fix_problem(ctx, PR_1_JOURNAL_INODE_NOT_CLEAR,
 					&pctx)) {
 				memset(inode, 0, inode_size);
@@ -12195,11 +12195,7 @@ static void swap_filesys(e2fsck_t ctx)
 void *e2fsck_allocate_memory(e2fsck_t ctx, unsigned int size,
 			     const char *description)
 {
-	void *ret;
-	char buf[256];
-
-	ret = xzalloc(size);
-	return ret;
+	return xzalloc(size);
 }
 
 static char *string_copy(const char *str, int len)
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/initialize.c b/e2fsprogs/old_e2fsprogs/ext2fs/initialize.c
@@ -83,7 +83,7 @@ static int calc_reserved_gdt_blocks(ext2_filsys fs)
 	if (rsv_gdb > EXT2_ADDR_PER_BLOCK(sb))
 		rsv_gdb = EXT2_ADDR_PER_BLOCK(sb);
 #ifdef RES_GDT_DEBUG
-	printf("max_blocks %lu, rsv_groups = %lu, rsv_gdb = %lu\n",
+	printf("max_blocks %lu, rsv_groups = %lu, rsv_gdb = %u\n",
 	       max_blocks, rsv_groups, rsv_gdb);
 #endif
 
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/unix_io.c b/e2fsprogs/old_e2fsprogs/ext2fs/unix_io.c
@@ -544,7 +544,7 @@ static errcode_t unix_read_blk(io_channel channel, unsigned long block,
 		/* If it's in the cache, use it! */
 		if ((cache = find_cached_block(data, block, &reuse[0]))) {
 #ifdef DEBUG
-			printf("Using cached block %d\n", block);
+			printf("Using cached block %lu\n", block);
 #endif
 			memcpy(cp, cache->buf, channel->block_size);
 			count--;
@@ -560,7 +560,7 @@ static errcode_t unix_read_blk(io_channel channel, unsigned long block,
 			if (find_cached_block(data, block+i, &reuse[i]))
 				break;
 #ifdef DEBUG
-		printf("Reading %d blocks starting at %d\n", i, block);
+		printf("Reading %d blocks starting at %lu\n", i, block);
 #endif
 		if ((retval = raw_read_blk(channel, data, block, i, cp)))
 			return retval;
diff --git a/e2fsprogs/old_e2fsprogs/fsck.c b/e2fsprogs/old_e2fsprogs/fsck.c
@@ -1239,7 +1239,6 @@ static void PRS(int argc, char **argv)
 						progress_fd = 0;
 					else {
 						goto next_arg;
-						i++;
 					}
 				}
 				break;
diff --git a/e2fsprogs/old_e2fsprogs/mke2fs.c b/e2fsprogs/old_e2fsprogs/mke2fs.c
@@ -385,7 +385,7 @@ static errcode_t zero_blocks(ext2_filsys fs, blk_t blk, int num,
 			     struct progress_struct *progress,
 			     blk_t *ret_blk, int *ret_count)
 {
-	int		j, count, next_update, next_update_incr;
+	int		j, count, next_update;
 	static char	*buf;
 	errcode_t	retval;
 
@@ -403,9 +403,7 @@ static errcode_t zero_blocks(ext2_filsys fs, blk_t blk, int num,
 	}
 	/* OK, do the write loop */
 	next_update = 0;
-	next_update_incr = num / 100;
-	if (next_update_incr < 1)
-		next_update_incr = 1;
+
 	for (j=0; j < num; j += STRIDE_LENGTH, blk += STRIDE_LENGTH) {
 		count = num - j;
 		if (count > STRIDE_LENGTH)
diff --git a/e2fsprogs/old_e2fsprogs/util.c b/e2fsprogs/old_e2fsprogs/util.c
@@ -117,7 +117,7 @@ void parse_journal_opts(char **journal_device, int *journal_flags,
 		}
 		if (strcmp(token, "device") == 0) {
 			*journal_device = blkid_get_devname(NULL, arg, NULL);
-			if (!journal_device) {
+			if (!*journal_device) {
 				journal_usage++;
 				continue;
 			}
diff --git a/libbb/pw_encrypt_md5.c b/libbb/pw_encrypt_md5.c
@@ -86,7 +86,7 @@ md5_crypt(char result[MD5_OUT_BUFSIZE], const unsigned char *pw, const unsigned
 
 	/* Get the length of the salt including "$1$" */
 	sl = 3;
-	while (salt[sl] && salt[sl] != '$' && sl < (3 + 8))
+	while (sl < (3 + 8) && salt[sl] && salt[sl] != '$')
 		sl++;
 
 	/* Hash. the password first, since that is what is most unknown */
diff --git a/miscutils/chat.c b/miscutils/chat.c
@@ -296,7 +296,7 @@ int chat_main(int argc UNUSED_PARAM, char **argv)
 						full_write(record_fd, buf+buf_len, 1);
 					}
 					// dump device input if ECHO ON
-					if (echo > 0) {
+					if (echo) {
 //						if (buf[buf_len] < ' ') {
 //							full_write(STDERR_FILENO, "^", 1);
 //							buf[buf_len] += '@';
diff --git a/networking/tc.c b/networking/tc.c
@@ -418,9 +418,6 @@ static int print_class(const struct sockaddr_nl *who UNUSED_PARAM,
 static int print_filter(const struct sockaddr_nl *who UNUSED_PARAM,
 						struct nlmsghdr *hdr, void *arg UNUSED_PARAM)
 {
-	struct tcmsg *msg = NLMSG_DATA(hdr);
-	int len = hdr->nlmsg_len;
-	struct rtattr * tb[TCA_MAX+1];
 	return 0;
 }
 
diff --git a/networking/traceroute.c b/networking/traceroute.c
@@ -791,7 +791,9 @@ static int
 common_traceroute_main(int op, char **argv)
 {
 	int minpacket;
+#ifdef IP_TOS
 	int tos = 0;
+#endif
 	int max_ttl = 30;
 	int nprobes = 3;
 	int first_ttl = 1;
@@ -838,8 +840,10 @@ common_traceroute_main(int op, char **argv)
 	if (op & OPT_IP_CHKSUM)
 		bb_error_msg("warning: ip checksums disabled");
 #endif
+#ifdef IP_TOS
 	if (op & OPT_TOS)
 		tos = xatou_range(tos_str, 0, 255);
+#endif
 	if (op & OPT_MAX_TTL)
 		max_ttl = xatou_range(max_ttl_str, 1, 255);
 	if (op & OPT_PORT)
diff --git a/util-linux/volume_id/unused_msdos.c b/util-linux/volume_id/unused_msdos.c
@@ -176,7 +176,7 @@ int FAST_FUNC volume_id_probe_msdos_part_table(struct volume_id *id, uint64_t of
 				if (id->partition_count < 4)
 					id->partition_count = 4;
 
-				p = &id->partitions[id->partition_count];
+//				p = &id->partitions[id->partition_count];
 
 //				if (is_raid(part[i].sys_ind))
 //					volume_id_set_usage_part(p, VOLUME_ID_RAID);

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ void generateMTFValues(EState* s)`
`249`	`249`	`static NOINLINE`
`250`	`250`	`void sendMTFValues(EState* s)`
`251`	`251`	`{`
`252`		`- int32_t v, t, i, j, gs, ge, totc, bt, bc, iter;`
	`252`	`+ int32_t v, t, i, j, gs, ge, bt, bc, iter;`
`253`	`253`	`int32_t nSelectors, alphaSize, minLen, maxLen, selCtr;`
`254`	`254`	`int32_t nGroups;`
`255`	`255`
`@@ -345,7 +345,6 @@ void sendMTFValues(EState* s)`
`345`	`345`	`}`
`346`	`346`	`#endif`
`347`	`347`	`nSelectors = 0;`
`348`		`- totc = 0;`
`349`	`348`	`gs = 0;`
`350`	`349`	`while (1) {`
`351`	`350`	`/--- Set group start & end marks. --/`
`@@ -411,7 +410,6 @@ void sendMTFValues(EState* s)`
`411`	`410`	`bt = t;`
`412`	`411`	`}`
`413`	`412`	`}`
`414`		`- totc += bc;`
`415`	`413`	`fave[bt]++;`
`416`	`414`	`s->selector[nSelectors] = bt;`
`417`	`415`	`nSelectors++;`
Original file line number	Diff line number	Diff line change
`@@ -818,7 +818,6 @@ static char *const bunzip_errors[] = {`
`818`	`818`	`/* Dumb little test thing, decompress stdin to stdout */`
`819`	`819`	`int main(int argc, char **argv)`
`820`	`820`	`{`
`821`		`- int i;`
`822`	`821`	`char c;`
`823`	`822`
`824`	`823`	`int i = unpack_bz2_stream(0, 1);`
Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ static int huft_build(const unsigned *b, const unsigned n,`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`/* Find minimum and maximum length, bound m by those /`
`339`		`- for (j = 1; (c[j] == 0) && (j <= BMAX); j++)`
	`339`	`+ for (j = 1; (j <= BMAX) && (c[j] == 0); j++)`
`340`	`340`	`continue;`
`341`	`341`	`k = j; /* minimum code length */`
`342`	`342`	`for (i = BMAX; (c[i] == 0) && i; i--)`
Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,6 @@ static int find_match(lzo1x_999_t *c, lzo_swd_p s,`
`466`	`466`	`}`
`467`	`467`
`468`	`468`	`s->m_len = 1;`
`469`		`- s->m_len = 1;`
`470`	`469`	`#ifdef SWD_BEST_OFF`
`471`	`470`	`if (s->use_best_off)`
`472`	`471`	`memset(s->best_pos, 0, sizeof(s->best_pos));`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ int main(int argc, char** argv)`
`115`	`115`	`argv[0], ret);`
`116`	`116`	`exit(1);`
`117`	`117`	`}`
`118`		`- if ((ret = blkid_probe_all(cache) < 0))`
	`118`	`+ if ((ret = blkid_probe_all(cache)) < 0)`
`119`	`119`	`fprintf(stderr, "error probing devices\n");`
`120`	`120`
`121`	`121`	`blkid_put_cache(cache);`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ extern int optind;`
`153`	`153`	`void usage(char *prog)`
`154`	`154`	`{`
`155`	`155`	`fprintf(stderr, "Usage: %s [-f blkid_file] [-m debug_mask]\n", prog);`
`156`		`- fprintf(stderr, "\tList all devices and exit\n", prog);`
	`156`	`+ fprintf(stderr, "\tList all devices and exit\n");`
`157`	`157`	`exit(1);`
`158`	`158`	`}`
`159`	`159`
`@@ -176,7 +176,7 @@ int main(int argc, char **argv)`
`176`	`176`	`case 'm':`
`177`	`177`	`blkid_debug_mask = strtoul (optarg, &tmp, 0);`
`178`	`178`	`if (*tmp) {`
`179`		`- fprintf(stderr, "Invalid debug mask: %d\n",`
	`179`	`+ fprintf(stderr, "Invalid debug mask: %s\n",`
`180`	`180`	`optarg);`
`181`	`181`	`exit(1);`
`182`	`182`	`}`