From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27564 invoked by alias); 22 Jun 2009 16:54:09 -0000 Received: (qmail 27557 invoked by alias); 22 Jun 2009 16:54:09 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_73,SPF_HELO_PASS X-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_73,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 members.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: 76e94d2830ea2871a971d6cf3792da886d96ef7a X-Git-Newrev: 8cd83cdbeced0a26c2b553e968f7ff44a1c45dab From: Lon Hohberger Message-Id: <20090622165338.0332D1201D4@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/msg00625.txt.bz2 Gitweb: http://git.fedorahosted.org/git/rgmanager.git?p=rgmanager.git;a=commitdiff;h=8cd83cdbeced0a26c2b553e968f7ff44a1c45dab Commit: 8cd83cdbeced0a26c2b553e968f7ff44a1c45dab Parent: 76e94d2830ea2871a971d6cf3792da886d96ef7a Author: Lon Hohberger AuthorDate: Fri May 29 10:10:17 2009 -0400 Committer: Lon Hohberger CommitterDate: Mon Jun 22 12:49:23 2009 -0400 rgmanager: Fix members.c and related build warnings Remove bad prototype from main.c. Signed-off-by: Lon Hohberger --- 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);