diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2016-08-22 12:11:24 -0400 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2016-08-29 05:00:23 -0700 |
| commit | 589a2c296ba8a778352ea54fd3d0fe02a573f053 (patch) | |
| tree | fe60831e5e940f3f6b9509842a3753e580e03149 | |
| parent | eaad568af3c11b9fd482f313b44f47e7e71e3362 (diff) | |
jbr: fix unused variable warnings/errors
http://review.gluster.org/14085 fixes a/the "leak" - via the
generated rpc/xdr headers - of pragmas that mask these warnings.
However 14085 won't pass the smoke test until all the warnings are
fixed.
Change-Id: I68c210f3bcc0f7754a89095c0d1408d57d5bd4a2
BUG: 1369124
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/15244
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
| -rw-r--r-- | xlators/experimental/jbr-server/src/all-templates.c | 7 | ||||
| -rw-r--r-- | xlators/experimental/jbr-server/src/jbr.c | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/xlators/experimental/jbr-server/src/all-templates.c b/xlators/experimental/jbr-server/src/all-templates.c index 7314701029c..0fb96ac0436 100644 --- a/xlators/experimental/jbr-server/src/all-templates.c +++ b/xlators/experimental/jbr-server/src/all-templates.c @@ -165,7 +165,6 @@ jbr_@NAME@_call_dispatch (call_frame_t *frame, xlator_t *this, int *op_errno, jbr_local_t *local = NULL; jbr_private_t *priv = NULL; int32_t ret = -1; - xlator_list_t *trav = NULL; GF_VALIDATE_OR_GOTO ("jbr", this, out); priv = this->private; @@ -308,7 +307,6 @@ int32_t jbr_@NAME@_continue (call_frame_t *frame, xlator_t *this, @LONG_ARGS@) { - int32_t ret = -1; gf_boolean_t result = _gf_false; jbr_local_t *local = NULL; jbr_private_t *priv = NULL; @@ -340,9 +338,8 @@ jbr_@NAME@_continue (call_frame_t *frame, xlator_t *this, @SHORT_ARGS@); } - ret = 0; out: - return ret; + return 0; } /* template-name write-complete */ @@ -351,7 +348,9 @@ jbr_@NAME@_complete (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno, @LONG_ARGS@) { +#if defined(JBR_CG_QUEUE) int32_t ret = -1; +#endif gf_boolean_t result = _gf_false; jbr_private_t *priv = NULL; jbr_local_t *local = NULL; diff --git a/xlators/experimental/jbr-server/src/jbr.c b/xlators/experimental/jbr-server/src/jbr.c index cd9e71a9ea3..926b5b3c742 100644 --- a/xlators/experimental/jbr-server/src/jbr.c +++ b/xlators/experimental/jbr-server/src/jbr.c @@ -287,7 +287,6 @@ out: int32_t jbr_initialize_xdata_set_attrs (xlator_t *this, dict_t **xdata) { - jbr_local_t *local = NULL; jbr_private_t *priv = NULL; int32_t ret = -1; uint32_t ti = 0; |