This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
fence-agents: master - fence_ipmilan: Cygwin doesn't like NULL intimes function
- From: Jan Friesse <honzaf at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Thu, 5 Feb 2009 16:32:28 +0000 (UTC)
- Subject: fence-agents: master - fence_ipmilan: Cygwin doesn't like NULL intimes function
Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commitdiff;h=edc77aea0a262ef4f7ef9bfb79e7bf576267cabf
Commit: edc77aea0a262ef4f7ef9bfb79e7bf576267cabf
Parent: b0a2c6d22154d1733228df5873167a18d0c4f183
Author: Jan Friesse <jfriesse@redhat.com>
AuthorDate: Thu Feb 5 17:32:00 2009 +0100
Committer: Jan Friesse <jfriesse@redhat.com>
CommitterDate: Thu Feb 5 17:32:00 2009 +0100
fence_ipmilan: Cygwin doesn't like NULL in times function
Times function was used with NULL parameter. On Linux everything
worked, but Cygwin doesn't like this (returned value was -1). This
patch add foo_tms, which is argument for times. This shouldn't hurt
anything, but makes Cygwin happy.
---
fence/agents/ipmilan/expect.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fence/agents/ipmilan/expect.c b/fence/agents/ipmilan/expect.c
index fa85bd8..45deb6a 100644
--- a/fence/agents/ipmilan/expect.c
+++ b/fence/agents/ipmilan/expect.c
@@ -68,7 +68,7 @@ ExpectToken(int fd, struct Etoken * toklist, int to_secs, char * buf
clock_t ticks;
int nchars = 1; /* reserve space for an EOS */
struct timeval tv;
-
+ struct tms foo_tms; /*This tms is used, because cygwin doesn't like NULL in times*/
struct Etoken * this;
/* Figure out when to give up. Handle lbolt wraparound */
@@ -77,7 +77,7 @@ ExpectToken(int fd, struct Etoken * toklist, int to_secs, char * buf
return -1;
}
- starttime = times(NULL);
+ starttime = times(&foo_tms);
ticks = (to_secs*CLOCKS_PER_SEC);
endtime = starttime + ticks;
@@ -94,7 +94,7 @@ ExpectToken(int fd, struct Etoken * toklist, int to_secs, char * buf
}
- while (now = times(NULL),
+ while (now = times(&foo_tms),
(wraparound && (now > starttime || now <= endtime))
|| (!wraparound && now <= endtime)) {