xfsprogs: remove write-only assignments

There are many instances where variable assignments are made,
but never read (or are re-assigned before they are read).
The Clang static analyzer finds these.

Here's a chunk of what I think are trivial removals of such
assignments; other detections point to more serious problems
(or are shared w/ kernel code so should probably be fixed there
first).

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
index 9f2f99dcb72907288c5d46da63860991bac39d09..71adb5700d5567ddd6d8f4cc08547c31212228e2 100644 (file)
--- a/copy/xfs_copy.c
+++ b/copy/xfs_copy.c
@@ -238,7 +238,7 @@ killall(void)
 void
 handler(int sig)
 {
-       pid_t   pid = getpid();
+       pid_t   pid;
        int     status, i;
 
        pid = wait(&status);
@@ -912,7 +912,6 @@ main(int argc, char **argv)
                            - (__uint64_t)mp->m_sb.sb_fdblocks + 10 * num_ags));
 
        kids = num_targets;
-       block = (struct xfs_btree_block *) btree_buf.data;
 
        for (agno = 0; agno < num_ags && kids > 0; agno++)  {
                /* read in first blocks of the ag */

diff --git a/db/bmap.c b/db/bmap.c
index 3951b9fd985dc2a5f818d83df00cd16b6a9a9dc5..fe620fd2b986b44662300cbe52de9b95b9d88b6b 100644 (file)
--- a/db/bmap.c
+++ b/db/bmap.c
@@ -88,7 +88,6 @@ bmap(
                }
        } else if (fmt == XFS_DINODE_FMT_BTREE) {
                push_cur();
-               bno = NULLFSBLOCK;
                rblock = (xfs_bmdr_block_t *)XFS_DFORK_PTR(dip, whichfork);
                fsize = XFS_DFORK_SIZE(dip, mp, whichfork);
                pp = XFS_BMDR_PTR_ADDR(rblock, 1, xfs_bmdr_maxrecs(mp, fsize, 0));

diff --git a/db/check.c b/db/check.c
index baf7f9f654ee2d384c311155484aa92126683e3b..4fd9fd0251be27b419b5a8bfba75f46834b020c9 100644 (file)
--- a/db/check.c
+++ b/db/check.c
@@ -1186,7 +1186,6 @@ blockuse_f(
                return 0;
        }
        optind = 0;
-       count = 1;
        shownames = 0;
        fsb = XFS_DADDR_TO_FSB(mp, iocur_top->off >> BBSHIFT);
        agno = XFS_FSB_TO_AGNO(mp, fsb);

diff --git a/db/convert.c b/db/convert.c
index 1fa094b4da9efb2049c251d7b5fecd4204127663..de4bfbf53c62475124c42ac3554ae3f0eaf4e3c5 100644 (file)
--- a/db/convert.c
+++ b/db/convert.c
@@ -200,7 +200,6 @@ convert_f(int argc, char **argv)
        if (cur_agno != NULLAGNUMBER && (conmask & M(AGNUMBER)) == 0) {
                cvals[CT_AGNUMBER].agnumber = cur_agno;
                mask |= M(AGNUMBER);
-               conmask |= ~ctydescs[CT_AGNUMBER].allowed;
        }
        v = 0;
        for (c = (ctype_t)0; c < NCTS; c++) {

diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c
index fb7eda8b139605de9b91c1e34c3eb688c0e2dfc3..77da70762ea1691b1886824844c5fd35a3ea93ce 100644 (file)
--- a/growfs/xfs_growfs.c
+++ b/growfs/xfs_growfs.c
@@ -132,7 +132,6 @@ main(int argc, char **argv)
        maxpct = esize = 0;
        dsize = lsize = rsize = 0LL;
        aflag = dflag = iflag = lflag = mflag = nflag = rflag = xflag = 0;
-       ci = 0;
 
        while ((c = getopt(argc, argv, "dD:e:ilL:m:np:rR:t:xV")) != EOF) {
                switch (c) {

diff --git a/include/bitops.h b/include/bitops.h
index 276e9a70874a56b3044bc1c4c1e8a61203f90ece..e914f8f763040bfaf3926e5f0e60ca0bb5c11f61 100644 (file)
--- a/include/bitops.h
+++ b/include/bitops.h
@@ -28,7 +28,6 @@ static inline int fls(int x)
                r -= 2;
        }
        if (!(x & 0x80000000u)) {
-               x <<= 1;
                r -= 1;
        }
        return r;

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index 1b691fbce17007c75bbeeed51d5db4260199d6d2..9887423f7309d3c0f29b7f92962bc7e840a89dcc 100644 (file)
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -741,7 +741,7 @@ libxfs_readbuf(struct xfs_buftarg *btp, xfs_daddr_t blkno, int len, int flags,
 int
 libxfs_readbufr_map(struct xfs_buftarg *btp, struct xfs_buf *bp, int flags)
 {
-       int     fd = libxfs_device_to_fd(btp->dev);
+       int     fd;
        int     error = 0;
        char    *buf;
        int     i;

diff --git a/logprint/log_misc.c b/logprint/log_misc.c
index a022df42f78d178a1dfcfa1430ac1ed835c4087d..45a2ed59b45e5a521f61b121ef1baa01f4d16dba 100644 (file)
--- a/logprint/log_misc.c
+++ b/logprint/log_misc.c
@@ -736,7 +736,6 @@ xlog_print_trans_inode(
            *ptr += be32_to_cpu(op_head->oh_len);
            if (op_head->oh_flags & XLOG_CONTINUE_TRANS)
                return 1;
-           op_head = (xlog_op_header_t *)*ptr;
     }
 
     return 0;

diff --git a/logprint/log_print_all.c b/logprint/log_print_all.c
index 8b932d272402df00dd49cbe95f3f6c75a28803c9..60da2722d1fce4ada32a4cd8deb0e3fac0c69bd9 100644 (file)
--- a/logprint/log_print_all.c
+++ b/logprint/log_print_all.c
@@ -89,7 +89,6 @@ xlog_recover_print_buffer(
        xfs_disk_dquot_t        *ddq;
 
        f = (xfs_buf_log_format_t *)item->ri_buf[0].i_addr;
-       len = item->ri_buf[0].i_len;
        printf("        ");
        ASSERT(f->blf_type == XFS_LI_BUF);
        printf(_("BUF:  #regs:%d   start blkno:0x%llx   len:%d   bmap size:%d   flags:0x%x\n"),

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index f7cf3948244bfe3ea7b9b938e769f63d8b3a7711..37c05a98f37a9be2d97d5376cda5dfdb6589eded 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -1964,8 +1964,6 @@ _("32 bit Project IDs always enabled on CRC enabled filesytems\n"));
                int             rswidth;
                __uint64_t      rtextbytes;
 
-               rswidth = 0;
-
                if (!norsflag && !xi.risfile && !(!rtsize && xi.disfile))
                        rswidth = ft.rtswidth;
                else

diff --git a/quota/path.c b/quota/path.c
index 47fdd935b86faa480c9fe97c5371a9220e380d6a..0c204ede0106c0e5b83ed683e4b417539393cef3 100644 (file)
--- a/quota/path.c
+++ b/quota/path.c
@@ -62,9 +62,9 @@ printpath(
                else if (qstat.qs_flags & XFS_QUOTA_GDQ_ACCT)
                        c = printf("%sgqnoenforce", c ? ", " : "");
                if (qstat.qs_flags & XFS_QUOTA_PDQ_ENFD)
-                       c = printf("%spquota", c ? ", " : "");
+                       printf("%spquota", c ? ", " : "");
                else if (qstat.qs_flags & XFS_QUOTA_PDQ_ACCT)
-                       c = printf("%spqnoenforce", c ? ", " : "");
+                       printf("%spqnoenforce", c ? ", " : "");
                printf(")");
        }
        printf("\n");

diff --git a/repair/attr_repair.c b/repair/attr_repair.c
index ba85fd9a44e8911a5f3e81b9985c13c67000ee40..ba85ac20828fb9ea21534a09a759ca716577b772 100644 (file)
--- a/repair/attr_repair.c
+++ b/repair/attr_repair.c
@@ -623,8 +623,6 @@ verify_da_path(xfs_mount_t  *mp,
 #ifdef XR_DIR_TRACE
                cursor->level[this_level].n = newnode;
 #endif
-               node = newnode;
-
                entry = cursor->level[this_level].index = 0;
        }
        /*

diff --git a/repair/dir2.c b/repair/dir2.c
index 06dc0008cd67c6c171263b833ae7045dbc16681d..14c1435f50776da40965d24f00a72c7043fdc0e3 100644 (file)
--- a/repair/dir2.c
+++ b/repair/dir2.c
@@ -606,7 +606,6 @@ _("bad level %d in block %u for directory inode %" PRIu64 "\n"),
                cursor->level[this_level].bno = dabno;
                cursor->level[this_level].hashval =
                        be32_to_cpu(btree[0].hashval);
-               node = newnode;
 
                entry = cursor->level[this_level].index = 0;
        }
@@ -780,7 +779,7 @@ process_sf_dir2(
         * run through entries, stop at first bad entry, don't need
         * to check for .. since that's encoded in its own field
         */
-       sfep = next_sfep = xfs_dir2_sf_firstentry(sfp);
+       next_sfep = xfs_dir2_sf_firstentry(sfp);
        for (i = 0;
             i < num_entries && ino_dir_size > (char *)next_sfep - (char *)sfp;
             i++) {

diff --git a/repair/phase5.c b/repair/phase5.c
index 77eb1257fe23ed18f8a05d091fbf1b081d204007..b1735978fe01ffb1a6cb6614f8d5310d38eb6ad3 100644 (file)
--- a/repair/phase5.c
+++ b/repair/phase5.c
@@ -153,7 +153,6 @@ mk_incore_fstree(xfs_mount_t *mp, xfs_agnumber_t agno)
                /*
                 * free extent ends here
                 */
-               in_extent = 0;
 #if defined(XR_BLD_FREE_TRACE) && defined(XR_BLD_ADD_EXTENT)
                fprintf(stderr, "adding extent %u [%u %u]\n",
                        agno, extent_start, extent_len);
@@ -223,7 +222,6 @@ setup_cursor(xfs_mount_t *mp, xfs_agnumber_t agno, bt_status_t *curs)
                do_error(_("error - not enough free space in filesystem\n"));
 
        agb_ptr = curs->btree_blocks;
-       j = curs->level[0].num_blocks;
 
        /*
         * set up the free block array
@@ -438,7 +436,6 @@ calculate_freespace_cursor(xfs_mount_t *mp, xfs_agnumber_t agno,
                do_error(_("can't rebuild fs trees -- not enough free space "
                           "on ag %u\n"), agno);
 
-       i = 0;
        while (ext_ptr != NULL && blocks_needed > 0)  {
                if (ext_ptr->ex_blockcount <= blocks_needed)  {
                        blocks_needed -= ext_ptr->ex_blockcount;

diff --git a/repair/phase6.c b/repair/phase6.c
index 446f3ee45e5a36d50db87cf88ec048e86bf4587a..0c35e1cef911070d7167de1a7c668cdd59c21e2c 100644 (file)
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -1858,7 +1858,6 @@ _("entry \"%s\" in dir inode %" PRIu64 " inconsistent with .. value (%" PRIu64 "
                if (junkit)  {
                        if (inum == orphanage_ino)
                                orphanage_ino = 0;
-                       junkit = 0;
                        nbad++;
                        if (!no_modify)  {
                                dep->name[0] = '/';

diff --git a/repair/prefetch.c b/repair/prefetch.c
index 4c32395d9f1d2f3566e43bd3eecbf7928f4b898a..6d6d344c3ccec67418f33521a648dc445d4ae963 100644 (file)
--- a/repair/prefetch.c
+++ b/repair/prefetch.c
@@ -575,7 +575,6 @@ pf_batch_read(
                         * go through the xfs_buf_t list copying from the
                         * read buffer into the xfs_buf_t's and release them.
                         */
-                       last_off = first_off;
                        for (i = 0; i < num; i++) {
 
                                pbuf = ((char *)buf) + (LIBXFS_BBTOOFF64(XFS_BUF_ADDR(bplist[i])) - first_off);

diff --git a/repair/sb.c b/repair/sb.c
index d928dc0685c4755522bd7c080c8dce6ec68678fa..5e0b0f268456ff0fe8e872171149307cfe1fc1d9 100644 (file)
--- a/repair/sb.c
+++ b/repair/sb.c
@@ -598,8 +598,6 @@ free_geo(fs_geo_list_t *list)
        fs_geo_list_t   *next;
        fs_geo_list_t   *current;
 
-       current = list;
-
        for (current = list; current != NULL; current = next)  {
                next = current->next;
                free(current);