From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30174 invoked by alias); 23 Jun 2009 08:46:37 -0000 Received: (qmail 30167 invoked by alias); 23 Jun 2009 08:46:36 -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: dlm: master - dlm_tool: make functions static To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: dlm.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 1dd78419c2736f3a53cebc0f747173aac7faa99d X-Git-Newrev: cfedf3350eba73920f6b5f96288f2e349a4f8632 From: "Fabio M. Di Nitto" Message-Id: <20090623082056.DBBFD12037E@lists.fedorahosted.org> Date: Tue, 23 Jun 2009 08:46: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/msg00719.txt.bz2 Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=cfedf3350eba73920f6b5f96288f2e349a4f8632 Commit: cfedf3350eba73920f6b5f96288f2e349a4f8632 Parent: 1dd78419c2736f3a53cebc0f747173aac7faa99d Author: Fabio M. Di Nitto AuthorDate: Wed May 6 06:59:51 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Tue Jun 23 09:42:52 2009 +0200 dlm_tool: make functions static address several warnings: cluster-stable3/dlm/tool/main.c: warning: no previous prototype for.. Signed-off-by: Fabio M. Di Nitto --- dlm/tool/main.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlm/tool/main.c b/dlm/tool/main.c index 51a4432..89ab52a 100644 --- a/dlm/tool/main.c +++ b/dlm/tool/main.c @@ -111,7 +111,7 @@ struct summary { unsigned int expect_replies; }; -const char *mode_str(int mode) +static const char *mode_str(int mode) { switch (mode) { case -1: @@ -132,7 +132,7 @@ const char *mode_str(int mode) return "??"; } -const char *msg_str(int type) +static const char *msg_str(int type) { switch (type) { case DLM_MSG_REQUEST: @@ -395,7 +395,7 @@ static char *flag_str(uint32_t flags) return join_flags; } -void do_join(char *name) +static void do_join(char *name) { dlm_lshandle_t *dh; uint32_t flags = 0; @@ -425,7 +425,7 @@ void do_join(char *name) printf("done\n"); } -void do_leave(char *name) +static void do_leave(char *name) { dlm_lshandle_t *dh; @@ -443,7 +443,7 @@ void do_leave(char *name) printf("done\n"); } -char *pr_master(int nodeid) +static char *pr_master(int nodeid) { static char buf[64]; @@ -459,7 +459,7 @@ char *pr_master(int nodeid) return buf; } -char *pr_extra(uint32_t flags, int root_list, int recover_list, +static char *pr_extra(uint32_t flags, int root_list, int recover_list, int recover_locks_count, char *first_lkid) { static char buf[128]; @@ -478,7 +478,7 @@ char *pr_extra(uint32_t flags, int root_list, int recover_list, return buf; } -void print_rsb(char *line, struct rinfo *ri) +static void print_rsb(char *line, struct rinfo *ri) { char type[4], namefmt[4], *p; char addr[64]; @@ -534,7 +534,7 @@ void print_rsb(char *line, struct rinfo *ri) fprintf(stderr, "print_rsb error rv %d line \"%s\"\n", rv, line); } -void print_lvb(char *line) +static void print_lvb(char *line) { char lvb[1024]; char type[4]; @@ -570,7 +570,7 @@ struct lkb { int nodeid, ownpid, status, grmode, rqmode, highbast, rsb_lookup, wait_type; }; -const char *pr_grmode(struct lkb *lkb) +static const char *pr_grmode(struct lkb *lkb) { if (lkb->status == DLM_LKSTS_GRANTED || lkb->status == DLM_LKSTS_CONVERT) return mode_str(lkb->grmode); @@ -580,7 +580,7 @@ const char *pr_grmode(struct lkb *lkb) return "XX"; } -const char *pr_rqmode(struct lkb *lkb) +static const char *pr_rqmode(struct lkb *lkb) { static char buf[5]; @@ -598,7 +598,7 @@ const char *pr_rqmode(struct lkb *lkb) } } -const char *pr_remote(struct lkb *lkb, struct rinfo *ri) +static const char *pr_remote(struct lkb *lkb, struct rinfo *ri) { static char buf[64]; @@ -615,7 +615,7 @@ const char *pr_remote(struct lkb *lkb, struct rinfo *ri) } } -const char *pr_wait(struct lkb *lkb) +static const char *pr_wait(struct lkb *lkb) { static char buf[16]; @@ -629,7 +629,7 @@ const char *pr_wait(struct lkb *lkb) } } -char *pr_verbose(struct lkb *lkb) +static char *pr_verbose(struct lkb *lkb) { static char buf[128]; @@ -643,7 +643,7 @@ char *pr_verbose(struct lkb *lkb) return buf; } -void print_lkb(char *line, struct rinfo *ri) +static void print_lkb(char *line, struct rinfo *ri) { struct lkb lkb; char type[4]; @@ -781,7 +781,7 @@ static void print_summary(struct summary *s) #define LOCK_LINE_MAX 1024 -void do_waiters(char *name, struct summary *sum) +static void do_waiters(char *name, struct summary *sum) { FILE *file; char path[PATH_MAX]; @@ -837,7 +837,7 @@ void do_waiters(char *name, struct summary *sum) fclose(file); } -void do_lockdebug(char *name) +static void do_lockdebug(char *name) { struct summary summary; struct rinfo info; @@ -901,7 +901,7 @@ void do_lockdebug(char *name) } } -void parse_r_name(char *line, char *name) +static void parse_r_name(char *line, char *name) { char *p; int i = 0; @@ -919,7 +919,7 @@ void parse_r_name(char *line, char *name) } } -void do_lockdump(char *name) +static void do_lockdump(char *name) { FILE *file; char path[PATH_MAX];