From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28237 invoked by alias); 22 Jun 2009 16:54:30 -0000 Received: (qmail 28231 invoked by alias); 22 Jun 2009 16:54:30 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: rgmanager: master - rgmanager: Fix vft.c and related build warnings To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: rgmanager.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 2fadc90177eb47037c5c39d3b11dcd169431143f X-Git-Newrev: a2f0087666316e779aadf75bb2c14f88a3556d66 From: Lon Hohberger Message-Id: <20090622165353.ABDE412027E@lists.fedorahosted.org> Date: Mon, 22 Jun 2009 16:54:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00631.txt.bz2 Gitweb: http://git.fedorahosted.org/git/rgmanager.git?p=rgmanager.git;a=commitdiff;h=a2f0087666316e779aadf75bb2c14f88a3556d66 Commit: a2f0087666316e779aadf75bb2c14f88a3556d66 Parent: 2fadc90177eb47037c5c39d3b11dcd169431143f Author: Lon Hohberger AuthorDate: Fri May 29 11:30:47 2009 -0400 Committer: Lon Hohberger CommitterDate: Mon Jun 22 12:50:25 2009 -0400 rgmanager: Fix vft.c and related build warnings Signed-off-by: Lon Hohberger --- rgmanager/include/vf.h | 3 +++ rgmanager/src/clulib/vft.c | 8 ++++---- rgmanager/src/daemons/rg_state.c | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/rgmanager/include/vf.h b/rgmanager/include/vf.h index e149a47..99239ab 100644 --- a/rgmanager/include/vf.h +++ b/rgmanager/include/vf.h @@ -166,10 +166,13 @@ int vf_write(cluster_member_list_t *membership, uint32_t flags, char *keyid, void *data, uint32_t datalen); int vf_read(cluster_member_list_t *membership, char *keyid, uint64_t *view, void **data, uint32_t *datalen); +int vf_read_local(char *keyid, uint64_t *view, void **data, uint32_t *datalen); + int vf_key_init(char *keyid, int timeout, vf_vote_cb_t vote_cb, vf_commit_cb_t commit_cb); int getuptime(struct timeval *tv); int vf_process_msg(msgctx_t *ctx, int nodeid, generic_msg_hdr *msgp, int nbytes); +void dump_vf_states(FILE *fp); #define MSGP_VFS 0x18dcf1 #define MSGP_VFC 0x0103fab diff --git a/rgmanager/src/clulib/vft.c b/rgmanager/src/clulib/vft.c index d944aae..1bae2a7 100644 --- a/rgmanager/src/clulib/vft.c +++ b/rgmanager/src/clulib/vft.c @@ -799,7 +799,7 @@ vf_try_commit(key_node_t *key_node) } -void +static void vf_event_loop(msgctx_t *ctx, int my_node_id) { int n; @@ -844,7 +844,7 @@ vf_wait_ready(void) } -void * +static void * vf_server(void *arg) { int my_node_id; @@ -1067,7 +1067,7 @@ vf_key_init(char *keyid, int timeout, vf_vote_cb_t vote_cb, } -vf_msg_t * +static vf_msg_t * build_vf_data_message(int cmd, char *keyid, void *data, uint32_t datalen, int viewno, int trans, uint32_t *retlen) { @@ -1521,7 +1521,7 @@ vf_read(cluster_member_list_t *membership, char *keyid, uint64_t *view, int -vf_read_local(char *keyid, int *view, void **data, uint32_t *datalen) +vf_read_local(char *keyid, uint64_t *view, void **data, uint32_t *datalen) { key_node_t *key_node = NULL; diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c index cddbaa6..9e13e21 100644 --- a/rgmanager/src/daemons/rg_state.c +++ b/rgmanager/src/daemons/rg_state.c @@ -407,7 +407,7 @@ get_rg_state_local(char *name, rg_state_t *svcblk) int datalen; #else void *data = NULL; - uint64_t viewno; + uint64_t viewno = 0; uint32_t datalen; #endif