diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 10:17:18 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 10:17:18 +0200 |
| commit | 6625450cbeee6cd4dc0ecc7418e552833708e95c (patch) | |
| tree | 8eb6bb2d4bf667ee87df5337d87d14d992ba0c17 /tests | |
| parent | 8ce2e3917705186cc708faa68d6b3faeebd0fa32 (diff) | |
| parent | b3d54ce6ffa3925e4cf3ee3d4dfafdfeb552e6dd (diff) | |
| download | rsyslog-6625450cbeee6cd4dc0ecc7418e552833708e95c.tar.gz rsyslog-6625450cbeee6cd4dc0ecc7418e552833708e95c.tar.xz rsyslog-6625450cbeee6cd4dc0ecc7418e552833708e95c.zip | |
Merge branch 'v5-beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tcpflood.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/tcpflood.c b/tests/tcpflood.c index 8a34f06f..f3a89c77 100644 --- a/tests/tcpflood.c +++ b/tests/tcpflood.c @@ -348,7 +348,7 @@ genMsg(char *buf, size_t maxBuf, int *pLenBuf, struct instdata *inst) do { done = 1; *pLenBuf = fread(buf, 1, 1024, dataFP); - if(feof(dataFP)) { + if(*pLenBuf == 0) { if(--numFileIterations > 0) { rewind(dataFP); done = 0; /* need new iteration */ @@ -662,7 +662,7 @@ runTests(void) int run; stats.totalRuntime = 0; - stats.minRuntime = (unsigned long long) 0xffffffffffffffffll; + stats.minRuntime = 0xffffffffllu; stats.maxRuntime = 0; stats.numRuns = numRuns; run = 1; |