← Commit list

9b2a9f021

Denys Vlasenko

2013-11-29

SUCCESS Duration: 180s

Subject

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

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

archival/libarchive/bz/compress.c+1 -3

@@ -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++;

archival/libarchive/decompress_bunzip2.c+0 -1

@@ -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);

archival/libarchive/decompress_gunzip.c+1 -1

@@ -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--)

archival/libarchive/lzo1x_9x.c+0 -1

@@ -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));

e2fsprogs/old_e2fsprogs/blkid/blkidP.h+0 -4

@@ -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

e2fsprogs/old_e2fsprogs/blkid/cache.c+1 -1

@@ -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);

e2fsprogs/old_e2fsprogs/blkid/dev.c+2 -2

@@ -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);
	}

e2fsprogs/old_e2fsprogs/blkid/read.c+1 -1

@@ -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++;

e2fsprogs/old_e2fsprogs/blkid/tag.c+3 -3

@@ -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) {

e2fsprogs/old_e2fsprogs/e2fsck.c+3 -7

@@ -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)

e2fsprogs/old_e2fsprogs/ext2fs/initialize.c+1 -1

@@ -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

e2fsprogs/old_e2fsprogs/ext2fs/unix_io.c+2 -2

@@ -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;

e2fsprogs/old_e2fsprogs/fsck.c+0 -1

@@ -1239,7 +1239,6 @@ static void PRS(int argc, char **argv)
	progress_fd = 0;
	else {
	goto next_arg;
-	i++;
	}
	}
	break;

e2fsprogs/old_e2fsprogs/mke2fs.c+2 -4

@@ -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)

e2fsprogs/old_e2fsprogs/util.c+1 -1

@@ -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;
	}

libbb/pw_encrypt_md5.c+1 -1

@@ -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 */

miscutils/chat.c+1 -1

@@ -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] += '@';

networking/tc.c+0 -3

@@ -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;
	}

networking/traceroute.c+4 -0

@@ -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)

util-linux/volume_id/unused_msdos.c+1 -1

@@ -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);