From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15957 invoked by alias); 22 Jun 2009 13:33:37 -0000 Received: (qmail 15929 invoked by alias); 22 Jun 2009 13:33:35 -0000 X-SWARE-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_43,J_CHICKENPOX_54,SPF_HELO_PASS X-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_43,J_CHICKENPOX_54,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: cluster: STABLE3 - rgmanager: Fix clusvcadm.c build warnings To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 01ac881ef03af2b4dfbcd57bf70495c1ae8cc458 X-Git-Newrev: d40032487246441e48281ea6aa2d752c145c6c85 From: Lon Hohberger Message-Id: <20090622133258.BF37312025B@lists.fedorahosted.org> Date: Mon, 22 Jun 2009 13:33: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/msg00586.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d40032487246441e48281ea6aa2d752c145c6c85 Commit: d40032487246441e48281ea6aa2d752c145c6c85 Parent: 01ac881ef03af2b4dfbcd57bf70495c1ae8cc458 Author: Lon Hohberger AuthorDate: Mon Jun 15 17:29:52 2009 -0400 Committer: Lon Hohberger CommitterDate: Mon Jun 22 09:32:02 2009 -0400 rgmanager: Fix clusvcadm.c build warnings Signed-off-by: Lon Hohberger --- rgmanager/src/daemons/groups.c | 1 + rgmanager/src/utils/clusvcadm.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/rgmanager/src/daemons/groups.c b/rgmanager/src/daemons/groups.c index 4ed4d5d..4e901a6 100644 --- a/rgmanager/src/daemons/groups.c +++ b/rgmanager/src/daemons/groups.c @@ -13,6 +13,7 @@ #include #include #include +#include /* Use address field in this because we never use it internally, and there is no extra space in the cman_node_t type. diff --git a/rgmanager/src/utils/clusvcadm.c b/rgmanager/src/utils/clusvcadm.c index bfd9d51..8fe7599 100644 --- a/rgmanager/src/utils/clusvcadm.c +++ b/rgmanager/src/utils/clusvcadm.c @@ -20,7 +20,7 @@ #endif -void +static void build_message(SmMessageSt *msgp, int action, char *svcName, int target, int arg1, int arg2) { @@ -39,7 +39,7 @@ build_message(SmMessageSt *msgp, int action, char *svcName, int target, } -int +static int do_lock_req(int req) { cman_handle_t ch; @@ -90,7 +90,7 @@ out: } -int +static int do_lock(void) { if (do_lock_req(RG_LOCK) != RG_SUCCESS) { @@ -102,7 +102,7 @@ do_lock(void) } -int +static int do_unlock(void) { if (do_lock_req(RG_UNLOCK) != RG_SUCCESS) { @@ -114,7 +114,7 @@ do_unlock(void) } -int +static int do_query_lock(void) { switch(do_lock_req(RG_QUERY_LOCK)) { @@ -132,7 +132,7 @@ do_query_lock(void) } -void +static void usage(char *name) { printf("usage: %s [command]\n\n", name); @@ -170,7 +170,7 @@ printf(" -u Unlock resource group managers.\n" } -int +static int find_closest_node(cluster_member_list_t *cml, char *name, size_t maxlen) { int x, c = 0, cl = 0, nc = 0, ncl = 0, cur = 0; @@ -224,7 +224,7 @@ main(int argc, char **argv) int fod = 0; int node_specified = 0; int me, svctarget = 0; - char *actionstr = NULL; + const char *actionstr = NULL; cluster_member_list_t *membership; if (geteuid() != (uid_t) 0) {