summaryrefslogtreecommitdiffstats
path: root/programs/bench.c
diff options
context:
space:
mode:
authorYann Collet <yann.collet.73@gmail.com>2015-04-12 07:21:35 (GMT)
committerYann Collet <yann.collet.73@gmail.com>2015-04-12 07:21:35 (GMT)
commit62ed15319570d80690915f0d0dba0dc2e9478631 (patch)
treef3728e1d237aed86798c5c9f0366bcdb3f500379 /programs/bench.c
parent9443f3d9244faedb08527bf684994a0495117833 (diff)
downloadlz4-62ed15319570d80690915f0d0dba0dc2e9478631.zip
lz4-62ed15319570d80690915f0d0dba0dc2e9478631.tar.gz
lz4-62ed15319570d80690915f0d0dba0dc2e9478631.tar.bz2
Fixed : a few minor coverity warnings
Diffstat (limited to 'programs/bench.c')
-rw-r--r--programs/bench.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/programs/bench.c b/programs/bench.c
index a5c72d6..8921f09 100644
--- a/programs/bench.c
+++ b/programs/bench.c
@@ -281,15 +281,11 @@ int BMK_benchFiles(const char** fileNamesTable, int nbFiles, int cLevel)
/* Check file existence */
inFileName = fileNamesTable[fileIdx++];
inFile = fopen( inFileName, "rb" );
- if (inFile==NULL)
- {
- DISPLAY( "Pb opening %s\n", inFileName);
- return 11;
- }
+ if (inFile==NULL) { DISPLAY( "Pb opening %s\n", inFileName); return 11; }
/* Memory allocation & restrictions */
inFileSize = BMK_GetFileSize(inFileName);
- if (inFileSize==0) { DISPLAY( "file is empty\n"); return 11; }
+ if (inFileSize==0) { DISPLAY( "file is empty\n"); fclose(inFile); return 11; }
benchedSize = (size_t) BMK_findMaxMem(inFileSize * 2) / 2;
if (benchedSize==0) { DISPLAY( "not enough memory\n"); return 11; }
if ((U64)benchedSize > inFileSize) benchedSize = (size_t)inFileSize;
@@ -306,7 +302,6 @@ int BMK_benchFiles(const char** fileNamesTable, int nbFiles, int cLevel)
compressedBuffSize = nbChunks * maxCompressedChunkSize;
compressedBuffer = (char*)malloc((size_t)compressedBuffSize);
-
if (!orig_buff || !compressedBuffer)
{
DISPLAY("\nError: not enough memory!\n");
@@ -402,6 +397,7 @@ int BMK_benchFiles(const char** fileNamesTable, int nbFiles, int cLevel)
}
milliTime = BMK_GetMilliSpan(milliTime);
+ nbLoops += !nbLoops; /* avoid division by zero */
if ((double)milliTime < fastestD*nbLoops) fastestD = (double)milliTime/nbLoops;
DISPLAY("%1i-%-14.14s : %9i -> %9i (%5.2f%%),%7.1f MB/s ,%7.1f MB/s \r", loopNb, inFileName, (int)benchedSize, (int)cSize, ratio, (double)benchedSize / fastestC / 1000., (double)benchedSize / fastestD / 1000.);
@@ -431,7 +427,7 @@ int BMK_benchFiles(const char** fileNamesTable, int nbFiles, int cLevel)
if (nbFiles > 1)
DISPLAY("%-16.16s :%10llu ->%10llu (%5.2f%%), %6.1f MB/s , %6.1f MB/s\n", " TOTAL", (long long unsigned int)totals, (long long unsigned int)totalz, (double)totalz/(double)totals*100., (double)totals/totalc/1000., (double)totals/totald/1000.);
- if (BMK_pause) { DISPLAY("\npress enter...\n"); getchar(); }
+ if (BMK_pause) { DISPLAY("\npress enter...\n"); (void)getchar(); }
return 0;
}