diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 09:43:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 09:43:06 +0200 |
| commit | e577d6bc7968ede9ed0cb8693b95478daf0ffb08 (patch) | |
| tree | d2d35558840b174f42646fcb51d9cd897178b654 /tests | |
| parent | 4f70113457993c536fc948d5b3b3e69dc7a92a8a (diff) | |
| parent | d86a212255d9fd1ef3e4b0e99db1f4bfd0625260 (diff) | |
| download | rsyslog-e577d6bc7968ede9ed0cb8693b95478daf0ffb08.tar.gz rsyslog-e577d6bc7968ede9ed0cb8693b95478daf0ffb08.tar.xz rsyslog-e577d6bc7968ede9ed0cb8693b95478daf0ffb08.zip | |
Merge branch 'v5-stable' into v6-stable
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 8485acbb..64d95abd 100644 --- a/tests/tcpflood.c +++ b/tests/tcpflood.c @@ -346,7 +346,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 */ @@ -660,7 +660,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; |