From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13466 invoked by alias); 6 May 2009 04:16:33 -0000 Received: (qmail 13460 invoked by alias); 6 May 2009 04:16:32 -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 - fenced: rename log flog 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: d6be487718c143791758bc778b356929646d3d27 X-Git-Newrev: 536d9f56e43cfe7cd07aae3c63be1660ec61727b From: "Fabio M. Di Nitto" Message-Id: <20090506041610.5976D120315@lists.fedorahosted.org> Date: Wed, 06 May 2009 04:16: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/msg00223.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=536d9f56e43cfe7cd07aae3c63be1660ec61727b Commit: 536d9f56e43cfe7cd07aae3c63be1660ec61727b Parent: d6be487718c143791758bc778b356929646d3d27 Author: Fabio M. Di Nitto AuthorDate: Wed May 6 06:15:24 2009 +0200 Committer: Fabio M. Di Nitto 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 --- 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,