From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24451 invoked by alias); 11 May 2009 15:13:05 -0000 Received: (qmail 24432 invoked by alias); 11 May 2009 15:13:04 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,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 - dlm_tool: constify functions 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: c3bfe36a2f1933bdcbe204841e14d07c131e6ba7 X-Git-Newrev: 5ab1ddf9a2f20853e105fab7176850534600fbeb From: David Teigland Message-Id: <20090511151230.1CF511201EC@lists.fedorahosted.org> Date: Mon, 11 May 2009 15:13: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/msg00257.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=5ab1ddf9a2f20853e105fab7176850534600fbeb Commit: 5ab1ddf9a2f20853e105fab7176850534600fbeb Parent: c3bfe36a2f1933bdcbe204841e14d07c131e6ba7 Author: Fabio M. Di Nitto AuthorDate: Wed May 6 06:56:20 2009 +0200 Committer: David Teigland CommitterDate: Mon May 11 10:05:05 2009 -0500 dlm_tool: constify functions addresses several: return discards qualifiers from pointer target type Signed-off-by: Fabio M. Di Nitto --- dlm/tool/main.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlm/tool/main.c b/dlm/tool/main.c index 1011f1e..5dff9a4 100644 --- a/dlm/tool/main.c +++ b/dlm/tool/main.c @@ -109,7 +109,7 @@ struct summary { unsigned int expect_replies; }; -char *mode_str(int mode) +const char *mode_str(int mode) { switch (mode) { case -1: @@ -130,7 +130,7 @@ char *mode_str(int mode) return "??"; } -char *msg_str(int type) +const char *msg_str(int type) { switch (type) { case DLM_MSG_REQUEST: @@ -568,7 +568,7 @@ struct lkb { int nodeid, ownpid, status, grmode, rqmode, highbast, rsb_lookup, wait_type; }; -char *pr_grmode(struct lkb *lkb) +const char *pr_grmode(struct lkb *lkb) { if (lkb->status == DLM_LKSTS_GRANTED || lkb->status == DLM_LKSTS_CONVERT) return mode_str(lkb->grmode); @@ -578,7 +578,7 @@ char *pr_grmode(struct lkb *lkb) return "XX"; } -char *pr_rqmode(struct lkb *lkb) +const char *pr_rqmode(struct lkb *lkb) { static char buf[5]; @@ -596,7 +596,7 @@ char *pr_rqmode(struct lkb *lkb) } } -char *pr_remote(struct lkb *lkb, struct rinfo *ri) +const char *pr_remote(struct lkb *lkb, struct rinfo *ri) { static char buf[64]; @@ -613,7 +613,7 @@ char *pr_remote(struct lkb *lkb, struct rinfo *ri) } } -char *pr_wait(struct lkb *lkb) +const char *pr_wait(struct lkb *lkb) { static char buf[16]; @@ -1041,7 +1041,7 @@ static char *dlmc_lf_str(uint32_t flags) return str; } -static char *nf_check_str(uint32_t flags) +static const char *nf_check_str(uint32_t flags) { if (flags & DLMC_NF_CHECK_FENCING) return "fence"; @@ -1055,7 +1055,7 @@ static char *nf_check_str(uint32_t flags) return "none"; } -static char *condition_str(int cond) +static const char *condition_str(int cond) { switch (cond) { case 0: