public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: Lon Hohberger <lon@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: rgmanager: master - rgmanager: Fix members.c and related build warnings Date: Mon, 22 Jun 2009 16:54:00 -0000 [thread overview] Message-ID: <20090622165338.0332D1201D4@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/rgmanager.git?p=rgmanager.git;a=commitdiff;h=8cd83cdbeced0a26c2b553e968f7ff44a1c45dab Commit: 8cd83cdbeced0a26c2b553e968f7ff44a1c45dab Parent: 76e94d2830ea2871a971d6cf3792da886d96ef7a 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 12:49:23 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);
reply other threads:[~2009-06-22 16:54 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20090622165338.0332D1201D4@lists.fedorahosted.org \ --to=lon@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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).