From 88f842024f018cae3fa39831212ef30c37dcf964 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Tue, 13 Sep 2016 05:54:59 -0400 Subject: xlators/glusterd: fix unused variable warnings/errors http://review.gluster.org/14085 fixes a "pragma leak" where the generated rpc/xdr headers have a pair of pragmas that disable these warnings. With the warnings disabled, many unused variables have crept into the code base. And 14085 won't pass its own smoke test until all these warnings are fixed. BUG: 1369124 Change-Id: I7ccaa4f1cc817fa81082cee83e99a2dc7e542e17 Signed-off-by: Kaleb S. KEITHLEY Reviewed-on: http://review.gluster.org/15479 Smoke: Gluster Build System Reviewed-by: Kotresh HR NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Atin Mukherjee --- xlators/mgmt/glusterd/src/glusterd-handler.c | 1 - xlators/mgmt/glusterd/src/glusterd-op-sm.c | 1 - xlators/mgmt/glusterd/src/glusterd-replace-brick.c | 3 --- xlators/mgmt/glusterd/src/glusterd-reset-brick.c | 7 ------- xlators/mgmt/glusterd/src/glusterd-utils.c | 2 -- 5 files changed, 14 deletions(-) diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index 03b1f7c2bd8..c55184ab943 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -5021,7 +5021,6 @@ glusterd_get_state (rpcsvc_request_t *req, dict_t *dict) glusterd_peer_hostname_t *peer_hostname_info = NULL; glusterd_volinfo_t *volinfo = NULL; glusterd_brickinfo_t *brickinfo = NULL; - glusterd_snap_t *snapinfo = NULL; xlator_t *this = NULL; char *odir = NULL; char *filename = NULL; diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 1e39dadc2ac..4e07c4f76b3 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -2017,7 +2017,6 @@ glusterd_op_reset_all_volume_options (xlator_t *this, dict_t *dict) char *next_version = NULL; gf_boolean_t quorum_action = _gf_false; gf_boolean_t option = _gf_false; - char *op_errstr = NULL; conf = this->private; ret = dict_get_str (dict, "key", &key); diff --git a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c index 2fb14208255..3d4764f7a85 100644 --- a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c +++ b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c @@ -187,7 +187,6 @@ glusterd_op_stage_replace_brick (dict_t *dict, char **op_errstr, glusterd_volinfo_t *volinfo = NULL; glusterd_brickinfo_t *src_brickinfo = NULL; char *host = NULL; - char *path = NULL; char msg[2048] = {0}; glusterd_peerinfo_t *peerinfo = NULL; glusterd_brickinfo_t *dst_brickinfo = NULL; @@ -195,8 +194,6 @@ glusterd_op_stage_replace_brick (dict_t *dict, char **op_errstr, char pidfile[PATH_MAX] = {0}; xlator_t *this = NULL; gf_boolean_t is_force = _gf_false; - pid_t pid = -1; - uuid_t volume_id = {0,}; char *dup_dstbrick = NULL; this = THIS; diff --git a/xlators/mgmt/glusterd/src/glusterd-reset-brick.c b/xlators/mgmt/glusterd/src/glusterd-reset-brick.c index d1efe0663fb..2e547c7e09f 100644 --- a/xlators/mgmt/glusterd/src/glusterd-reset-brick.c +++ b/xlators/mgmt/glusterd/src/glusterd-reset-brick.c @@ -32,7 +32,6 @@ glusterd_reset_brick_prevalidate (dict_t *dict, char **op_errstr, dict_t *rsp_dict) { int ret = 0; - int32_t port = 0; char *src_brick = NULL; char *dst_brick = NULL; char *volname = NULL; @@ -44,14 +43,10 @@ glusterd_reset_brick_prevalidate (dict_t *dict, char **op_errstr, char msg[2048] = {0}; glusterd_peerinfo_t *peerinfo = NULL; glusterd_brickinfo_t *dst_brickinfo = NULL; - gf_boolean_t enabled = _gf_false; glusterd_conf_t *priv = NULL; - char *savetok = NULL; char pidfile[PATH_MAX] = {0}; - char *task_id_str = NULL; xlator_t *this = NULL; gf_boolean_t is_force = _gf_false; - gsync_status_param_t param = {0,}; pid_t pid = -1; uuid_t volume_id = {0,}; char *dup_dstbrick = NULL; @@ -240,7 +235,6 @@ int glusterd_op_reset_brick (dict_t *dict, dict_t *rsp_dict) { int ret = 0; - dict_t *ctx = NULL; char *op = NULL; glusterd_volinfo_t *volinfo = NULL; char *volname = NULL; @@ -250,7 +244,6 @@ glusterd_op_reset_brick (dict_t *dict, dict_t *rsp_dict) char *dst_brick = NULL; glusterd_brickinfo_t *src_brickinfo = NULL; glusterd_brickinfo_t *dst_brickinfo = NULL; - char *task_id_str = NULL; char pidfile[PATH_MAX] = {0,}; this = THIS; diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 557ed6bc916..db3db2decc2 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -11200,8 +11200,6 @@ glusterd_volume_get_type_str (glusterd_volinfo_t *volinfo, char **voltype_str) { int ret = -1; int type = 0; - int brick_count = 0; - int dist_count = 0; GF_VALIDATE_OR_GOTO (THIS->name, volinfo, out); -- cgit