diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 08:23:12 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 08:23:12 +0200 |
| commit | 24a81f99508821b608c1dc9e3fee6c2ebbaed59d (patch) | |
| tree | e69dcb9f836bb1f6a4489f428fb6a54f051781bf /tests | |
| parent | fdcaca6b85d65ef2c9b4814cc4a9adda4568e24f (diff) | |
| parent | d86a212255d9fd1ef3e4b0e99db1f4bfd0625260 (diff) | |
| download | rsyslog-24a81f99508821b608c1dc9e3fee6c2ebbaed59d.tar.gz rsyslog-24a81f99508821b608c1dc9e3fee6c2ebbaed59d.tar.xz rsyslog-24a81f99508821b608c1dc9e3fee6c2ebbaed59d.zip | |
Merge branch 'v5-stable' into v5-beta
Conflicts:
ChangeLog
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; |