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

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/archival/libarchive/bz/compress.c b/archival/libarchive/bz/compress.c
index a7dd72d..23de9d3 100644 (file)
--- 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
index fb1f292..6396fe4 100644 (file)
--- 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
index 4e6b138..7c6f38e 100644 (file)
--- 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
index 3e33198..2b490ae 100644 (file)
--- 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
index d6b2b42..bbadc8e 100644 (file)
--- 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
index d1d2914..251e499 100644 (file)
--- 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
index bb0cc91..260e49c 100644 (file)
--- 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
index f795a5d..feeda51 100644 (file)
--- 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
index 8337b46..7424ede 100644 (file)
--- 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
index 373e8ce..8400a92 100644 (file)
--- 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
index da2d151..240335b 100644 (file)
--- 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
index 474f073..3c95829 100644 (file)
--- 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
index 3a0743b..91cce97 100644 (file)
--- 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
index 35d717a..e44d986 100644 (file)
--- 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
index a61abc2..e6758e0 100644 (file)
--- 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
index 889e09c..1e52eca 100644 (file)
--- 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
index ce994f8..bd2abc2 100644 (file)
--- 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
index b9a4d16..533f7c0 100644 (file)
--- 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
index 0c18d6c..97a7a19 100644 (file)
--- 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
index d2fc66c..5ebaa3e 100644 (file)
--- 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);