Eliminate many "var set but not used" warnings with newer gcc.

This fixes ~200 such warnings, but leaves three categories untouched.

(1) Rpcgen code.

(2) Macros which set variables in the outer (calling function) scope.

(3) Variables which are set via function calls which may have side effects.

Change-Id: I6554555f78ed26134251504b038da7e94adacbcd
BUG: 2550
Reviewed-on: http://review.gluster.com/371
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@gluster.com>

4 files changed, 0 insertions, 26 deletions

diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c
index f623fad9f..b5168605b 100644
--- a/xlators/cluster/dht/src/dht-common.c
+++ b/xlators/cluster/dht/src/dht-common.c
@@ -150,7 +150,6 @@ dht_lookup_dir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                     inode_t *inode, struct iatt *stbuf, dict_t *xattr,
                     struct iatt *postparent)
 {
-        dht_conf_t   *conf                    = NULL;
         dht_local_t  *local                   = NULL;
         int           this_call_cnt           = 0;
         call_frame_t *prev                    = NULL;
@@ -164,7 +163,6 @@ dht_lookup_dir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         GF_VALIDATE_OR_GOTO ("dht", this->private, out);
         GF_VALIDATE_OR_GOTO ("dht", cookie, out);
 
-        conf  = this->private;
         local = frame->local;
         prev  = cookie;
 
@@ -553,7 +551,6 @@ dht_lookup_everywhere_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                            inode_t *inode, struct iatt *buf, dict_t *xattr,
                            struct iatt *postparent)
 {
-        dht_conf_t   *conf          = NULL;
         dht_local_t  *local         = NULL;
         int           this_call_cnt = 0;
         call_frame_t *prev          = NULL;
@@ -570,8 +567,6 @@ dht_lookup_everywhere_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         GF_VALIDATE_OR_GOTO ("dht", cookie, out);
         GF_VALIDATE_OR_GOTO ("dht", this->private, out);
 
-        conf   = this->private;
-
         local  = frame->local;
         loc    = &local->loc;
 
@@ -2962,13 +2957,11 @@ dht_readdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         off_t         next_offset = 0;
         int           count = 0;
         dht_layout_t *layout = 0;
-        dht_conf_t   *conf   = NULL;
         xlator_t     *subvol = 0;
 
         INIT_LIST_HEAD (&entries.list);
         prev = cookie;
         local = frame->local;
-        conf  = this->private;
 
         if (op_ret < 0)
                 goto done;
@@ -3051,7 +3044,6 @@ dht_do_readdir (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size,
                 off_t yoff, int whichop)
 {
         dht_local_t  *local  = NULL;
-        dht_conf_t   *conf = NULL;
         int           op_errno = -1;
         xlator_t     *xvol = NULL;
         off_t         xoff = 0;
@@ -3061,8 +3053,6 @@ dht_do_readdir (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size,
         VALIDATE_OR_GOTO (this, err);
         VALIDATE_OR_GOTO (fd, err);
 
-        conf = this->private;
-
         local = dht_local_init (frame);
         if (!local) {
 
@@ -3287,15 +3277,12 @@ dht_mknod (call_frame_t *frame, xlator_t *this,
         int          op_errno = -1;
         int          ret = -1;
         xlator_t    *avail_subvol = NULL;
-        dht_conf_t  *conf = NULL;
         dht_local_t *local = NULL;
 
         VALIDATE_OR_GOTO (frame, err);
         VALIDATE_OR_GOTO (this, err);
         VALIDATE_OR_GOTO (loc, err);
 
-        conf = this->private;
-
         dht_get_du_info (frame, this, loc);
 
         local = dht_local_init (frame);
@@ -3499,10 +3486,8 @@ dht_link_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 {
         call_frame_t *prev = NULL;
         dht_layout_t *layout = NULL;
-        dht_local_t  *local = NULL;
 
         prev = cookie;
-        local = frame->local;
 
         if (op_ret == -1)
                 goto out;
@@ -3711,7 +3696,6 @@ dht_create (call_frame_t *frame, xlator_t *this,
         int          op_errno = -1;
         int          ret = -1;
         xlator_t    *subvol = NULL;
-        dht_conf_t  *conf = NULL;
         dht_local_t *local = NULL;
         xlator_t    *avail_subvol = NULL;
 
@@ -3719,8 +3703,6 @@ dht_create (call_frame_t *frame, xlator_t *this,
         VALIDATE_OR_GOTO (this, err);
         VALIDATE_OR_GOTO (loc, err);
 
-        conf = this->private;
-
         dht_get_du_info (frame, this, loc);
 
         local = dht_local_init (frame);
@@ -3838,9 +3820,7 @@ dht_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         int           subvol_filled = 0;
         call_frame_t *prev = NULL;
         dht_layout_t *layout = NULL;
-        dht_conf_t   *conf = NULL;
 
-        conf = this->private;
         local = frame->local;
         prev  = cookie;
         layout = local->layout;
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c
index 745be4ce5..60008f2bd 100644
--- a/xlators/cluster/dht/src/dht-rebalance.c
+++ b/xlators/cluster/dht/src/dht-rebalance.c
@@ -452,12 +452,10 @@ static int
 rebalance_task (void *data)
 {
         int           ret   = -1;
-        xlator_t     *this  = NULL;
         dht_local_t  *local = NULL;
         call_frame_t *frame = NULL;
 
         frame = data;
-        this = THIS;
 
         local = frame->local;
 
diff --git a/xlators/cluster/dht/src/dht-rename.c b/xlators/cluster/dht/src/dht-rename.c
index 538cfac95..bdc4dd2b6 100644
--- a/xlators/cluster/dht/src/dht-rename.c
+++ b/xlators/cluster/dht/src/dht-rename.c
@@ -172,9 +172,7 @@ int
 dht_rename_dir_do (call_frame_t *frame, xlator_t *this)
 {
         dht_local_t  *local = NULL;
-        dht_conf_t   *conf = NULL;
 
-        conf = this->private;
         local = frame->local;
 
         if (local->op_ret == -1)
diff --git a/xlators/cluster/dht/src/dht-selfheal.c b/xlators/cluster/dht/src/dht-selfheal.c
index ca41fd81d..882e0209e 100644
--- a/xlators/cluster/dht/src/dht-selfheal.c
+++ b/xlators/cluster/dht/src/dht-selfheal.c
@@ -786,7 +786,6 @@ dht_selfheal_directory (call_frame_t *frame, dht_selfheal_dir_cbk_t dir_cbk,
                         loc_t *loc, dht_layout_t *layout)
 {
         dht_local_t *local    = NULL;
-        uint32_t     holes    = 0;
         uint32_t     down     = 0;
         uint32_t     misc     = 0;
         int          ret      = 0;
@@ -802,7 +801,6 @@ dht_selfheal_directory (call_frame_t *frame, dht_selfheal_dir_cbk_t dir_cbk,
                               &local->selfheal.down,
                               &local->selfheal.misc);
 
-        holes    = local->selfheal.hole_cnt;
         down     = local->selfheal.down;
         misc     = local->selfheal.misc;