public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: cluster: STABLE3 - fenced: rename log flog Date: Wed, 06 May 2009 04:16:00 -0000 [thread overview] Message-ID: <20090506041610.5976D120315@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=536d9f56e43cfe7cd07aae3c63be1660ec61727b Commit: 536d9f56e43cfe7cd07aae3c63be1660ec61727b Parent: d6be487718c143791758bc778b356929646d3d27 Author: Fabio M. Di Nitto <fdinitto@redhat.com> AuthorDate: Wed May 6 06:15:24 2009 +0200 Committer: Fabio M. Di Nitto <fdinitto@redhat.com> CommitterDate: Wed May 6 06:15:24 2009 +0200 fenced: rename log flog stable3/fence/fenced/recover.c: warning: declaration of ???log??? shadows a built-in function Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com> --- fence/fenced/recover.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/fence/fenced/recover.c b/fence/fenced/recover.c index dc0297c..342b3ff 100644 --- a/fence/fenced/recover.c +++ b/fence/fenced/recover.c @@ -276,12 +276,12 @@ static char *fe_str(int r) } #define FL_SIZE 32 -static struct fence_log log[FL_SIZE]; +static struct fence_log flog[FL_SIZE]; void fence_victims(struct fd *fd) { struct node *node; - int error, i, ll, log_count; + int error, i, ll, flog_count; int override = -1; int cman_member, cpg_member, ext; @@ -309,29 +309,29 @@ void fence_victims(struct fd *fd) continue; } - memset(&log, 0, sizeof(log)); - log_count = 0; + memset(&flog, 0, sizeof(flog)); + flog_count = 0; log_level(LOG_INFO, "fencing node %s", node->name); query_unlock(); - error = fence_node(node->name, log, FL_SIZE, &log_count); + error = fence_node(node->name, flog, FL_SIZE, &flog_count); query_lock(); - if (log_count > FL_SIZE) { - log_error("fence_node log overflow %d", log_count); - log_count = FL_SIZE; + if (flog_count > FL_SIZE) { + log_error("fence_node log overflow %d", flog_count); + flog_count = FL_SIZE; } - for (i = 0; i < log_count; i++) { - ll = (log[i].error == FE_AGENT_SUCCESS) ? LOG_DEBUG: + for (i = 0; i < flog_count; i++) { + ll = (flog[i].error == FE_AGENT_SUCCESS) ? LOG_DEBUG: LOG_ERR; log_level(ll, "fence %s dev %d.%d agent %s result: %s", node->name, - log[i].method_num, log[i].device_num, - log[i].agent_name[0] ? - log[i].agent_name : "none", - fe_str(log[i].error)); + flog[i].method_num, flog[i].device_num, + flog[i].agent_name[0] ? + flog[i].agent_name : "none", + fe_str(flog[i].error)); } log_error("fence %s %s", node->name,
reply other threads:[~2009-05-06 4:16 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=20090506041610.5976D120315@lists.fedorahosted.org \ --to=fabbione@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).