summaryrefslogtreecommitdiffstats
path: root/xlators/features/changelog/lib
diff options
context:
space:
mode:
authorKaleb S. KEITHLEY <kkeithle@redhat.com>2016-08-22 12:11:24 -0400
committerKaleb KEITHLEY <kkeithle@redhat.com>2016-08-29 09:21:56 -0700
commitae2ddb59381c37d79b4f1ce13028f02e9fffea47 (patch)
treed55b3fa9efc9302bc3bfddbe134fb25959cafb1b /xlators/features/changelog/lib
parent4640061a357632258541141163764314993e40ca (diff)
core: 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: I3d8a7a3de35058aa97eab59d3f59208396298b03 BUG: 1369124 Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/15246 Smoke: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Kotresh HR <khiremat@redhat.com>
Diffstat (limited to 'xlators/features/changelog/lib')
-rw-r--r--xlators/features/changelog/lib/src/gf-changelog-api.c5
-rw-r--r--xlators/features/changelog/lib/src/gf-changelog-journal-handler.c9
-rw-r--r--xlators/features/changelog/lib/src/gf-changelog-reborp.c3
-rw-r--r--xlators/features/changelog/lib/src/gf-changelog-rpc.c1
-rw-r--r--xlators/features/changelog/lib/src/gf-history-changelog.c5
5 files changed, 2 insertions, 21 deletions
diff --git a/xlators/features/changelog/lib/src/gf-changelog-api.c b/xlators/features/changelog/lib/src/gf-changelog-api.c
index d2a28bc6d52..71312f4ce95 100644
--- a/xlators/features/changelog/lib/src/gf-changelog-api.c
+++ b/xlators/features/changelog/lib/src/gf-changelog-api.c
@@ -152,9 +152,7 @@ out:
ssize_t
gf_changelog_scan ()
{
- int ret = 0;
int tracker_fd = 0;
- size_t len = 0;
size_t off = 0;
xlator_t *this = NULL;
size_t nr_entries = 0;
@@ -181,9 +179,6 @@ gf_changelog_scan ()
if (gf_ftruncate (tracker_fd, 0))
goto out;
- len = offsetof(struct dirent, d_name)
- + pathconf(jnl->jnl_processing_dir, _PC_NAME_MAX) + 1;
-
rewinddir (jnl->jnl_dir);
for (;;) {
diff --git a/xlators/features/changelog/lib/src/gf-changelog-journal-handler.c b/xlators/features/changelog/lib/src/gf-changelog-journal-handler.c
index 6ea7cac88da..2f197eed318 100644
--- a/xlators/features/changelog/lib/src/gf-changelog-journal-handler.c
+++ b/xlators/features/changelog/lib/src/gf-changelog-journal-handler.c
@@ -647,7 +647,6 @@ gf_changelog_consume (xlator_t *this,
void *
gf_changelog_process (void *data)
{
- int ret = 0;
xlator_t *this = NULL;
gf_changelog_journal_t *jnl = NULL;
gf_changelog_entry_t *entry = NULL;
@@ -675,8 +674,8 @@ gf_changelog_process (void *data)
pthread_mutex_unlock (&jnl_proc->lock);
if (entry) {
- ret = gf_changelog_consume (this, jnl,
- entry->path, _gf_false);
+ (void) gf_changelog_consume (this, jnl,
+ entry->path, _gf_false);
GF_FREE (entry);
}
}
@@ -715,7 +714,6 @@ void
gf_changelog_handle_journal (void *xl, char *brick,
void *cbkdata, changelog_event_t *event)
{
- int ret = 0;
gf_changelog_journal_t *jnl = NULL;
gf_changelog_processor_t *jnl_proc = NULL;
@@ -974,11 +972,8 @@ gf_changelog_init_history (xlator_t *this,
void
gf_changelog_journal_fini (void *xl, char *brick, void *data)
{
- int ret = 0;
- xlator_t *this = NULL;
gf_changelog_journal_t *jnl = NULL;
- this = xl;
jnl = data;
gf_changelog_cleanup_processor (jnl);
diff --git a/xlators/features/changelog/lib/src/gf-changelog-reborp.c b/xlators/features/changelog/lib/src/gf-changelog-reborp.c
index 8fd01d0c77a..4337d2575a9 100644
--- a/xlators/features/changelog/lib/src/gf-changelog-reborp.c
+++ b/xlators/features/changelog/lib/src/gf-changelog-reborp.c
@@ -101,7 +101,6 @@ gf_changelog_reborp_rpcsvc_notify (rpcsvc_t *rpc, void *mydata,
{
int ret = 0;
xlator_t *this = NULL;
- gf_private_t *priv = NULL;
gf_changelog_t *entry = NULL;
if (!(event == RPCSVC_EVENT_ACCEPT ||
@@ -110,7 +109,6 @@ gf_changelog_reborp_rpcsvc_notify (rpcsvc_t *rpc, void *mydata,
entry = mydata;
this = entry->this;
- priv = this->private;
switch (event) {
case RPCSVC_EVENT_ACCEPT:
@@ -236,7 +234,6 @@ pick_event_unordered (struct gf_event_list *ev, struct gf_event **event)
void *
gf_changelog_callback_invoker (void *arg)
{
- int ret = 0;
xlator_t *this = NULL;
gf_changelog_t *entry = NULL;
struct iovec *vec = NULL;
diff --git a/xlators/features/changelog/lib/src/gf-changelog-rpc.c b/xlators/features/changelog/lib/src/gf-changelog-rpc.c
index 270632bc71b..b9339a770d1 100644
--- a/xlators/features/changelog/lib/src/gf-changelog-rpc.c
+++ b/xlators/features/changelog/lib/src/gf-changelog-rpc.c
@@ -57,7 +57,6 @@ gf_probe_changelog_cbk (struct rpc_req *req,
int
gf_probe_changelog_filter (call_frame_t *frame, xlator_t *this, void *data)
{
- int ret = 0;
char *sock = NULL;
gf_changelog_t *entry = NULL;
changelog_probe_req req = {0,};
diff --git a/xlators/features/changelog/lib/src/gf-history-changelog.c b/xlators/features/changelog/lib/src/gf-history-changelog.c
index 45f2d8ba9f3..0c2320097d4 100644
--- a/xlators/features/changelog/lib/src/gf-history-changelog.c
+++ b/xlators/features/changelog/lib/src/gf-history-changelog.c
@@ -214,9 +214,7 @@ out:
ssize_t
gf_history_changelog_scan ()
{
- int ret = 0;
int tracker_fd = 0;
- size_t len = 0;
size_t off = 0;
xlator_t *this = NULL;
size_t nr_entries = 0;
@@ -258,9 +256,6 @@ gf_history_changelog_scan ()
if (gf_ftruncate (tracker_fd, 0))
goto out;
- len = offsetof (struct dirent, d_name)
- + pathconf (hist_jnl->jnl_processing_dir, _PC_NAME_MAX) + 1;
-
rewinddir (hist_jnl->jnl_dir);
for (;;) {