fence: master - fenced: rename log flog

fence: master - fenced: rename log flog

[David Teigland]

Gitweb:        http://git.fedorahosted.org/git/fence.git?p=fence.git;a=commitdiff;h=1abfc583276ec32a29ee87a571850b21502c01ae
Commit:        1abfc583276ec32a29ee87a571850b21502c01ae
Parent:        56305f3bd0d46e37173f67b95adadfb71e35e799
Author:        David Teigland <teigland@redhat.com>
AuthorDate:    Wed May 6 10:49:48 2009 -0500
Committer:     David Teigland <teigland@redhat.com>
CommitterDate: Wed May 6 10:49:48 2009 -0500

fenced: rename log flog

stable3/fence/fenced/recover.c:  warning: declaration of ???log??? shadows a built-in function

Signed-off-by: David Teigland <teigland@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 2507b74..70a9047 100644
--- a/fence/fenced/recover.c
+++ b/fence/fenced/recover.c
@@ -277,12 +277,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 cluster_member, cpg_member, ext;
 
@@ -307,29 +307,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,