Gitweb:
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: e3fdd916da5ad54e37bbc457f336fb482dbe3b14
Parent: 5ed49a26ac09148993799eecae15eaa6d6623984
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Wed Dec 16 12:56:43 2009 -0500
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Fri Feb 19 10:14:28 2010 -0500
rgmanager: Clean up build warnings
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
rgmanager/src/clulib/vft.c | 6 +++---
rgmanager/src/daemons/main.c | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/rgmanager/src/clulib/vft.c b/rgmanager/src/clulib/vft.c
index 9c78a12..0113bad 100644
--- a/rgmanager/src/clulib/vft.c
+++ b/rgmanager/src/clulib/vft.c
@@ -885,7 +885,7 @@ vf_server(void *arg)
*/
int
vf_init(int my_node_id, uint16_t my_port, vf_vote_cb_t vcb,
- vf_commit_cb_t ccb, int cluster_timeout)
+ vf_commit_cb_t ccb, int _cluster_timeout)
{
struct vf_args *args;
msgctx_t *ctx;
@@ -912,8 +912,8 @@ vf_init(int my_node_id, uint16_t my_port, vf_vote_cb_t vcb,
pthread_mutex_lock(&vf_mutex);
_port = my_port;
_node_id = my_node_id;
- if (cluster_timeout)
- _vf_timeout = cluster_timeout;
+ if (_cluster_timeout)
+ _vf_timeout = _cluster_timeout;
default_vote_cb = vcb;
default_commit_cb = ccb;
pthread_mutex_unlock(&vf_mutex);
diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c
index 3b73be8..4e34246 100644
--- a/rgmanager/src/daemons/main.c
+++ b/rgmanager/src/daemons/main.c
@@ -948,7 +948,6 @@ main(int argc, char **argv)
msgctx_t *local_ctx;
pthread_t th;
cman_handle_t clu = NULL;
- int cluster_timeout = 10;
while ((rv = getopt(argc, argv, "wfdN")) != EOF) {
switch (rv) {