public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
* cluster: STABLE3 - rgmanager: Fix members.c and related build warnings
@ 2009-06-22 13:48 Lon Hohberger
0 siblings, 0 replies; only message in thread
From: Lon Hohberger @ 2009-06-22 13:48 UTC (permalink / raw)
To: cluster-cvs-relay
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=92204d657fb3331af2f88cecb87b114d5c03cc55
Commit: 92204d657fb3331af2f88cecb87b114d5c03cc55
Parent: 3ad6b5a8946af989476628a53db3de6d93face78
Author: Lon Hohberger <lhh@redhat.com>
AuthorDate: Fri May 29 10:10:17 2009 -0400
Committer: Lon Hohberger <lhh@redhat.com>
CommitterDate: Mon Jun 22 09:32:01 2009 -0400
rgmanager: Fix members.c and related build warnings
Remove bad prototype from main.c.
Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
rgmanager/include/members.h | 1 +
rgmanager/src/clulib/members.c | 66 ----------------------------------------
rgmanager/src/daemons/main.c | 1 -
3 files changed, 1 insertions(+), 67 deletions(-)
diff --git a/rgmanager/include/members.h b/rgmanager/include/members.h
index 768f040..7e99e17 100644
--- a/rgmanager/include/members.h
+++ b/rgmanager/include/members.h
@@ -12,6 +12,7 @@ typedef enum {
int get_my_nodeid(cman_handle_t h);
int my_id(void);
+int set_my_id(int);
cluster_member_list_t * get_member_list(cman_handle_t h);
void free_member_list(cluster_member_list_t *ml);
void member_set_state(int nodeid, int state);
diff --git a/rgmanager/src/clulib/members.c b/rgmanager/src/clulib/members.c
index fb77cea..5f98708 100644
--- a/rgmanager/src/clulib/members.c
+++ b/rgmanager/src/clulib/members.c
@@ -244,50 +244,6 @@ member_set_state(int nodeid, int state)
int
-member_low_id(void)
-{
- int x = 0, low = -1;
-
- pthread_rwlock_wrlock(&memblock);
- if (!membership) {
- pthread_rwlock_unlock(&memblock);
- return low;
- }
-
- for (x = 0; x < membership->cml_count; x++) {
- if ((membership->cml_members[x].cn_member) &&
- ((membership->cml_members[x].cn_nodeid < low) || (low == -1)))
- low = membership->cml_members[x].cn_nodeid;
- }
- pthread_rwlock_unlock(&memblock);
-
- return low;
-}
-
-
-int
-member_high_id(void)
-{
- int x = 0, high = -1;
-
- pthread_rwlock_wrlock(&memblock);
- if (!membership) {
- pthread_rwlock_unlock(&memblock);
- return high;
- }
-
- for (x = 0; x < membership->cml_count; x++) {
- if (membership->cml_members[x].cn_member &&
- (membership->cml_members[x].cn_nodeid > high))
- high = membership->cml_members[x].cn_nodeid;
- }
- pthread_rwlock_unlock(&memblock);
-
- return high;
-}
-
-
-int
member_online(int nodeid)
{
int x = 0, ret = 0;
@@ -310,28 +266,6 @@ member_online(int nodeid)
}
-
-char *
-member_name(int id, char *buf, int buflen)
-{
- char *n;
-
- if (!buf || !buflen)
- return NULL;
-
- pthread_rwlock_rdlock(&memblock);
- n = memb_id_to_name(membership, id);
- if (n) {
- strncpy(buf, n, buflen);
- } else {
- buf[0] = 0;
- }
- pthread_rwlock_unlock(&memblock);
- return buf;
-}
-
-
-
cluster_member_list_t *
get_member_list(cman_handle_t h)
{
diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c
index f800ab0..7ae7020 100644
--- a/rgmanager/src/daemons/main.c
+++ b/rgmanager/src/daemons/main.c
@@ -34,7 +34,6 @@ void node_event_q(int, int, int, int);
int daemon_init(char *);
void daemon_cleanup(void);
void kill_resource_groups(void);
-void set_my_id(int);
void flag_shutdown(int sig);
void hard_exit(void);
int send_rg_states(msgctx_t *, int);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-06-22 13:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-06-22 13:48 cluster: STABLE3 - rgmanager: Fix members.c and related build warnings Lon Hohberger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).