From eeb356584897ff778ffcbacff1c71d35d277b726 Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Fri, 29 May 2015 16:33:09 +0530 Subject: features/changelog: Remove inline keyword to avoid warnings (gcc v5.1.1) When compiled with gcc5, following warnings were displayed and volume start failed: changelog-helpers.h:499:1: warning: inline function 'changelog_dispatch_event' declared but never defined changelog_dispatch_event (xlator_t *, changelog_priv_t *, changelog_event_t *); gf-changelog-journal-handler.c:692:17: warning: 'list_add_tail' is static but used in inline function 'gf_changelog_queue_journal' which is not static list_add_tail (&entry->list, &jnl_proc->entries); Fix is to remove the keyword from function prototype and definitions. Change-Id: I188b35b7ca087a94d7a48a052b05a6d845e3b74b BUG: 1226307 Signed-off-by: Anoop C S Reviewed-on: http://review.gluster.org/11004 Tested-by: NetBSD Build System Reviewed-by: Venky Shankar --- .../changelog/lib/src/gf-changelog-journal-handler.c | 2 +- xlators/features/changelog/lib/src/gf-changelog-reborp.c | 4 ++-- xlators/features/changelog/src/changelog-helpers.c | 12 ++++++------ xlators/features/changelog/src/changelog-helpers.h | 12 ++++++------ xlators/features/changelog/src/changelog-rpc.c | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) (limited to 'xlators/features') 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 e5bc38f865d..2975b06757f 100644 --- a/xlators/features/changelog/lib/src/gf-changelog-journal-handler.c +++ b/xlators/features/changelog/lib/src/gf-changelog-journal-handler.c @@ -671,7 +671,7 @@ gf_changelog_process (void *data) return NULL; } -inline void +void gf_changelog_queue_journal (gf_changelog_processor_t *jnl_proc, changelog_event_t *event) { diff --git a/xlators/features/changelog/lib/src/gf-changelog-reborp.c b/xlators/features/changelog/lib/src/gf-changelog-reborp.c index 457d829e69b..2a1e56ae79e 100644 --- a/xlators/features/changelog/lib/src/gf-changelog-reborp.c +++ b/xlators/features/changelog/lib/src/gf-changelog-reborp.c @@ -197,7 +197,7 @@ gf_changelog_reborp_init_rpc_listner (xlator_t *this, * * @FIXME: cleanup this bugger once server filters events. */ -inline void +void gf_changelog_invoke_callback (gf_changelog_t *entry, struct iovec **vec, int payloadcnt) { @@ -236,7 +236,7 @@ __is_expected_sequence (struct gf_event_list *ev, struct gf_event *event) return (ev->next_seq == event->seq); } -inline int +int __can_process_event (struct gf_event_list *ev, struct gf_event **event) { *event = list_first_entry (&ev->events, struct gf_event, list); diff --git a/xlators/features/changelog/src/changelog-helpers.c b/xlators/features/changelog/src/changelog-helpers.c index a604891f0b3..dd09716d800 100644 --- a/xlators/features/changelog/src/changelog-helpers.c +++ b/xlators/features/changelog/src/changelog-helpers.c @@ -100,7 +100,7 @@ changelog_selector_index (unsigned int selector) return (ffs (selector) - 1); } -inline int +int changelog_ev_selected (xlator_t *this, changelog_ev_selector_t *selection, unsigned int selector) @@ -116,7 +116,7 @@ changelog_ev_selected (xlator_t *this, && (selection->ref[idx] > 0)); } -inline void +void changelog_select_event (xlator_t *this, changelog_ev_selector_t *selection, unsigned int selector) @@ -138,7 +138,7 @@ changelog_select_event (xlator_t *this, UNLOCK (&selection->reflock); } -inline void +void changelog_deselect_event (xlator_t *this, changelog_ev_selector_t *selection, unsigned int selector) @@ -160,7 +160,7 @@ changelog_deselect_event (xlator_t *this, UNLOCK (&selection->reflock); } -inline int +int changelog_init_event_selection (xlator_t *this, changelog_ev_selector_t *selection) { @@ -182,7 +182,7 @@ changelog_init_event_selection (xlator_t *this, return 0; } -inline int +int changelog_cleanup_event_selection (xlator_t *this, changelog_ev_selector_t *selection) { @@ -221,7 +221,7 @@ changelog_perform_dispatch (xlator_t *this, rbuf_write_complete (opaque); } -inline void +void changelog_dispatch_event (xlator_t *this, changelog_priv_t *priv, changelog_event_t *ev) { diff --git a/xlators/features/changelog/src/changelog-helpers.h b/xlators/features/changelog/src/changelog-helpers.h index 4416b9cdfdb..6219d8d9a4b 100644 --- a/xlators/features/changelog/src/changelog-helpers.h +++ b/xlators/features/changelog/src/changelog-helpers.h @@ -486,17 +486,17 @@ changelog_fill_entry_buf (call_frame_t *frame, xlator_t *this, loc_t *loc, changelog_local_t **local); /* event selection routines */ -inline void changelog_select_event (xlator_t *, +void changelog_select_event (xlator_t *, changelog_ev_selector_t *, unsigned int); -inline void changelog_deselect_event (xlator_t *, +void changelog_deselect_event (xlator_t *, changelog_ev_selector_t *, unsigned int); -inline int changelog_init_event_selection (xlator_t *, +int changelog_init_event_selection (xlator_t *, changelog_ev_selector_t *); -inline int changelog_cleanup_event_selection (xlator_t *, +int changelog_cleanup_event_selection (xlator_t *, changelog_ev_selector_t *); -inline int changelog_ev_selected (xlator_t *, +int changelog_ev_selected (xlator_t *, changelog_ev_selector_t *, unsigned int); -inline void +void changelog_dispatch_event (xlator_t *, changelog_priv_t *, changelog_event_t *); changelog_inode_ctx_t * diff --git a/xlators/features/changelog/src/changelog-rpc.c b/xlators/features/changelog/src/changelog-rpc.c index ffbc61e40f9..c7c0fffa9f5 100644 --- a/xlators/features/changelog/src/changelog-rpc.c +++ b/xlators/features/changelog/src/changelog-rpc.c @@ -187,7 +187,7 @@ changelog_rpc_clnt_cleanup (changelog_rpc_clnt_t *crpc) GF_FREE (crpc); } -inline changelog_rpc_clnt_t * +static inline changelog_rpc_clnt_t * changelog_rpc_clnt_init (xlator_t *this, changelog_probe_req *rpc_req, changelog_clnt_t *c_clnt) { -- cgit