facebook/zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

closed file at end of function, created another variable to keep exit points simpler

Browse Source
This commit is contained in:
Paul Cruz 2017-06-15 15:53:02 -07:00
parent 8b3ff7c9bc
commit e7f02fc58a
1 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
programs/fileio.c
View File

@ -887,6 +887,7 @@ static int getFileInfo(fileInfo_t* info, const char* inFileName){
info->numActualFrames = 0; info->numActualFrames = 0;
info->numSkippableFrames = 0; info->numSkippableFrames = 0;
info->canComputeDecompSize = 1; info->canComputeDecompSize = 1;
int detectError = 0;
/* begin analyzing frame */ /* begin analyzing frame */
for( ; ; ){ for( ; ; ){
BYTE headerBuffer[ZSTD_FRAMEHEADERSIZE_MAX]; BYTE headerBuffer[ZSTD_FRAMEHEADERSIZE_MAX];
@ -897,8 +898,8 @@ static int getFileInfo(fileInfo_t* info, const char* inFileName){
} }
else{ else{
DISPLAY("Error: did not reach end of file but ran out of frames\n"); DISPLAY("Error: did not reach end of file but ran out of frames\n");
fclose(srcFile); detectError = 1;
return 1; break;
} }
} }
U32 const magicNumber = MEM_readLE32(headerBuffer); U32 const magicNumber = MEM_readLE32(headerBuffer);
@ -906,7 +907,6 @@ static int getFileInfo(fileInfo_t* info, const char* inFileName){
U64 const frameContentSize = ZSTD_getFrameContentSize(headerBuffer, numBytesRead); U64 const frameContentSize = ZSTD_getFrameContentSize(headerBuffer, numBytesRead);
if (frameContentSize == ZSTD_CONTENTSIZE_ERROR || frameContentSize == ZSTD_CONTENTSIZE_UNKNOWN) { if (frameContentSize == ZSTD_CONTENTSIZE_ERROR || frameContentSize == ZSTD_CONTENTSIZE_UNKNOWN) {
info->canComputeDecompSize = 0; info->canComputeDecompSize = 0;
DISPLAY("could not compute decompressed size\n");
} }
else { else {
info->decompressedSize += frameContentSize; info->decompressedSize += frameContentSize;
@ -914,34 +914,24 @@ static int getFileInfo(fileInfo_t* info, const char* inFileName){
size_t const headerSize = ZSTD_frameHeaderSize(headerBuffer, numBytesRead); size_t const headerSize = ZSTD_frameHeaderSize(headerBuffer, numBytesRead);
if (ZSTD_isError(headerSize)) { if (ZSTD_isError(headerSize)) {
DISPLAY("Error: could not determine frame header size\n"); DISPLAY("Error: could not determine frame header size\n");
fclose(srcFile); detectError = 1;
return 1; break;
} }
{ {
/* go back to the beginning of the frame */ /* move to the end of the frame header */
int const ret = fseek(srcFile, -numBytesRead, SEEK_CUR); int const ret = fseek(srcFile, headerSize-numBytesRead, SEEK_CUR);
if (ret != 0) { if (ret != 0) {
DISPLAY("Error: could not rewind to beginning of frame\n"); DISPLAY("Error: could not move to end of frame header\n");
fclose(srcFile); detectError = 1;
return 1; break;
}
}
{
/* skip frame header */
int const ret = fseek(srcFile, headerSize, SEEK_CUR);
if (ret != 0) {
DISPLAY("Error: could not skip header\n");
fclose(srcFile);
return 1;
} }
} }
/* skip the rest of the blocks in the frame */ /* skip the rest of the blocks in the frame */
{ {
int lastBlock = 0; int lastBlock = 0;
int readBytes = 0; size_t readBytes = 0;
do{ do{
BYTE blockHeaderBuffer[3]; BYTE blockHeaderBuffer[3];
U32 blockHeader; U32 blockHeader;
@ -949,44 +939,59 @@ static int getFileInfo(fileInfo_t* info, const char* inFileName){
readBytes = fread(blockHeaderBuffer, 1, 3, srcFile); readBytes = fread(blockHeaderBuffer, 1, 3, srcFile);
if (readBytes != 3) { if (readBytes != 3) {
DISPLAY("There was a problem reading the block header\n"); DISPLAY("There was a problem reading the block header\n");
fclose(srcFile); detectError = 1;
return 1; break;
} }
blockHeader = MEM_readLE24(blockHeaderBuffer); blockHeader = MEM_readLE24(blockHeaderBuffer);
lastBlock = blockHeader & 1; lastBlock = blockHeader & 1;
blockSize = (blockHeader - (blockHeader & 7)) >> 3; blockSize = (blockHeader - (blockHeader & 7)) >> 3;
fseek(srcFile, blockSize, SEEK_CUR); {
}while (lastBlock != 1); int const ret = fseek(srcFile, blockSize, SEEK_CUR);
if (ret != 0) {
DISPLAY("Error: could not skip to end of block\n");
detectError = 1;
break;
}
}
} while (lastBlock != 1);
if (detectError) {
break;
}
} }
{ {
/* check if checksum is used */ /* check if checksum is used */
BYTE frameHeaderDescriptor = headerBuffer[4]; BYTE const frameHeaderDescriptor = headerBuffer[4];
int contentChecksumFlag = (frameHeaderDescriptor & (1 << 2)) >> 2; int const contentChecksumFlag = (frameHeaderDescriptor & (1 << 2)) >> 2;
if (contentChecksumFlag) { if (contentChecksumFlag) {
info->usesCheck = 1; info->usesCheck = 1;
} }
if (contentChecksumFlag) { if (contentChecksumFlag) {
fseek(srcFile, 4, SEEK_CUR); int const ret = fseek(srcFile, 4, SEEK_CUR);
if (ret != 0) {
DISPLAY("Error: could not skip past checksum\n");
detectError = 1;
break;
}
} }
} }
info->numActualFrames++; info->numActualFrames++;
} }
else if (magicNumber == ZSTD_MAGIC_SKIPPABLE_START) { else if (magicNumber == ZSTD_MAGIC_SKIPPABLE_START) {
BYTE frameSizeBuffer[4]; BYTE frameSizeBuffer[4];
long frameSize;
size_t readBytes = fread(frameSizeBuffer, 1, 4, srcFile); size_t readBytes = fread(frameSizeBuffer, 1, 4, srcFile);
info->numSkippableFrames++;
if (readBytes != 4) { if (readBytes != 4) {
DISPLAY("There was an error reading skippable frame size"); DISPLAY("There was an error reading skippable frame size");
exit(1); detectError = 1;
break;
} }
frameSize = MEM_readLE32(frameSizeBuffer); long const frameSize = MEM_readLE32(frameSizeBuffer);
{ {
int const ret = fseek(srcFile, frameSize, SEEK_CUR); int const ret = fseek(srcFile, frameSize, SEEK_CUR);
if (ret != 0) { if (ret != 0) {
DISPLAY("Error: could not find end of skippable frame\n"); DISPLAY("Error: could not find end of skippable frame\n");
fclose(srcFile); detectError = 1;
return 1; break;
} }
} }
fseek(srcFile, frameSize, SEEK_CUR); fseek(srcFile, frameSize, SEEK_CUR);
@ -994,7 +999,7 @@ static int getFileInfo(fileInfo_t* info, const char* inFileName){
} }
} }
fclose(srcFile); fclose(srcFile);
return 0; return detectError;
} }
void displayInfo(const char* inFileName, fileInfo_t* info, int displayLevel){ void displayInfo(const char* inFileName, fileInfo_t* info, int displayLevel){
double const compressedSizeMB = (double)info->compressedSize/(1 MB); double const compressedSizeMB = (double)info->compressedSize/(1 MB);