public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
* fence: master - fence_node: rename log flog
@ 2009-05-06 15:57 David Teigland
0 siblings, 0 replies; only message in thread
From: David Teigland @ 2009-05-06 15:57 UTC (permalink / raw)
To: cluster-cvs-relay
Gitweb: http://git.fedorahosted.org/git/fence.git?p=fence.git;a=commitdiff;h=56305f3bd0d46e37173f67b95adadfb71e35e799
Commit: 56305f3bd0d46e37173f67b95adadfb71e35e799
Parent: 1ad8a83754a75195f8143e5aec6e5a7d55a9852b
Author: David Teigland <teigland@redhat.com>
AuthorDate: Tue May 5 17:35:21 2009 -0500
Committer: David Teigland <teigland@redhat.com>
CommitterDate: Wed May 6 10:45:13 2009 -0500
fence_node: rename log flog
stable3/fence/fence_node/fence_node.c:19: warning: declaration of ???log??? shadows a built-in function
Signed-off-by: David Teigland <teigland@redhat.com>
---
fence/fence_node/fence_node.c | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/fence/fence_node/fence_node.c b/fence/fence_node/fence_node.c
index 3d7fc5e..8ca2038 100644
--- a/fence/fence_node/fence_node.c
+++ b/fence/fence_node/fence_node.c
@@ -16,8 +16,8 @@ static int verbose;
static int unfence;
#define FL_SIZE 32
-static struct fence_log log[FL_SIZE];
-static int log_count;
+static struct fence_log flog[FL_SIZE];
+static int flog_count;
static char *action = "fence";
#define OPTION_STRING "UvhV"
@@ -175,36 +175,36 @@ int main(int argc, char *argv[])
if (!victim && unfence)
victim = our_name;
- memset(&log, 0, sizeof(log));
- log_count = 0;
+ memset(&flog, 0, sizeof(flog));
+ flog_count = 0;
if (unfence)
- error = unfence_node(victim, log, FL_SIZE, &log_count);
+ error = unfence_node(victim, flog, FL_SIZE, &flog_count);
else
- error = fence_node(victim, log, FL_SIZE, &log_count);
+ error = fence_node(victim, flog, FL_SIZE, &flog_count);
if (!verbose)
goto skip;
- if (log_count > FL_SIZE) {
- fprintf(stderr, "%s_node log overflow %d", action, log_count);
- log_count = FL_SIZE;
+ if (flog_count > FL_SIZE) {
+ fprintf(stderr, "%s_node log overflow %d", action, flog_count);
+ flog_count = FL_SIZE;
}
- for (i = 0; i < log_count; i++) {
+ for (i = 0; i < flog_count; i++) {
fprintf(stderr, "%s %s dev %d.%d agent %s result: %s\n",
- action, victim, log[i].method_num, log[i].device_num,
- log[i].agent_name[0] ? log[i].agent_name : "none",
- fe_str(log[i].error));
+ action, victim, flog[i].method_num, flog[i].device_num,
+ flog[i].agent_name[0] ? flog[i].agent_name : "none",
+ fe_str(flog[i].error));
if (verbose < 2)
continue;
- for (c = 0; c < strlen(log[i].agent_args); c++) {
- if (log[i].agent_args[c] == '\n')
- log[i].agent_args[c] = ' ';
+ for (c = 0; c < strlen(flog[i].agent_args); c++) {
+ if (flog[i].agent_args[c] == '\n')
+ flog[i].agent_args[c] = ' ';
}
- fprintf(stderr, "agent args: %s\n", log[i].agent_args);
+ fprintf(stderr, "agent args: %s\n", flog[i].agent_args);
}
skip:
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-05-06 15:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-05-06 15:57 fence: master - fence_node: rename log flog David Teigland
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).