sharpetronics/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-10-08 00:04:02 -04:00
Code Issues Projects Releases Wiki Activity

rearranging code to allow for consts

Browse Source
This commit is contained in:
Paul Cruz 2017-06-15 16:12:04 -07:00
parent e49afae2ab
commit 0757eae6ff
1 changed files with 79 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
programs/fileio.c
View File

@ -877,6 +877,7 @@ typedef struct {
* if successful, returns 0, otherwise returns 1 * if successful, returns 0, otherwise returns 1
*/ */
static int getFileInfo(fileInfo_t* info, const char* inFileName){ static int getFileInfo(fileInfo_t* info, const char* inFileName){
int detectError = 0;
FILE* const srcFile = FIO_openSrcFile(inFileName); FILE* const srcFile = FIO_openSrcFile(inFileName);
if (srcFile == NULL) { if (srcFile == NULL) {
DISPLAY("Error: could not open source file %s\n", inFileName); DISPLAY("Error: could not open source file %s\n", inFileName);
@ -887,7 +888,6 @@ 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];
@ -902,100 +902,100 @@ static int getFileInfo(fileInfo_t* info, const char* inFileName){
break; break;
} }
} }
U32 const magicNumber = MEM_readLE32(headerBuffer); {
if (magicNumber == ZSTD_MAGICNUMBER) { U32 const magicNumber = MEM_readLE32(headerBuffer);
U64 const frameContentSize = ZSTD_getFrameContentSize(headerBuffer, numBytesRead); if (magicNumber == ZSTD_MAGICNUMBER) {
if (frameContentSize == ZSTD_CONTENTSIZE_ERROR || frameContentSize == ZSTD_CONTENTSIZE_UNKNOWN) { U64 const frameContentSize = ZSTD_getFrameContentSize(headerBuffer, numBytesRead);
info->canComputeDecompSize = 0; if (frameContentSize == ZSTD_CONTENTSIZE_ERROR || frameContentSize == ZSTD_CONTENTSIZE_UNKNOWN) {
} info->canComputeDecompSize = 0;
else {
info->decompressedSize += frameContentSize;
}
size_t const headerSize = ZSTD_frameHeaderSize(headerBuffer, numBytesRead);
if (ZSTD_isError(headerSize)) {
DISPLAY("Error: could not determine frame header size\n");
detectError = 1;
break;
}
{
/* move to the end of the frame header */
int const ret = fseek(srcFile, ((long)headerSize)-((long)numBytesRead), SEEK_CUR);
if (ret != 0) {
DISPLAY("Error: could not move to end of frame header\n");
detectError = 1;
break;
} }
} else {
info->decompressedSize += frameContentSize;
/* skip the rest of the blocks in the frame */ }
{ {
int lastBlock = 0; /* move to the end of the frame header */
size_t readBytes = 0; size_t const headerSize = ZSTD_frameHeaderSize(headerBuffer, numBytesRead);
do{ if (ZSTD_isError(headerSize)) {
BYTE blockHeaderBuffer[3]; DISPLAY("Error: could not determine frame header size\n");
U32 blockHeader;
int blockSize;
readBytes = fread(blockHeaderBuffer, 1, 3, srcFile);
if (readBytes != 3) {
DISPLAY("There was a problem reading the block header\n");
detectError = 1; detectError = 1;
break; break;
} }
blockHeader = MEM_readLE24(blockHeaderBuffer); int const ret = fseek(srcFile, ((long)headerSize)-((long)numBytesRead), SEEK_CUR);
lastBlock = blockHeader & 1; if (ret != 0) {
blockSize = (blockHeader - (blockHeader & 7)) >> 3; DISPLAY("Error: could not move to end of frame header\n");
{ detectError = 1;
int const ret = fseek(srcFile, blockSize, SEEK_CUR); break;
}
}
/* skip the rest of the blocks in the frame */
{
int lastBlock = 0;
size_t readBytes = 0;
do{
BYTE blockHeaderBuffer[3];
U32 blockHeader;
int blockSize;
readBytes = fread(blockHeaderBuffer, 1, 3, srcFile);
if (readBytes != 3) {
DISPLAY("There was a problem reading the block header\n");
detectError = 1;
break;
}
blockHeader = MEM_readLE24(blockHeaderBuffer);
lastBlock = blockHeader & 1;
blockSize = (blockHeader - (blockHeader & 7)) >> 3;
{
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 */
BYTE const frameHeaderDescriptor = headerBuffer[4];
int const contentChecksumFlag = (frameHeaderDescriptor & (1 << 2)) >> 2;
if (contentChecksumFlag) {
info->usesCheck = 1;
}
if (contentChecksumFlag) {
int const ret = fseek(srcFile, 4, SEEK_CUR);
if (ret != 0) { if (ret != 0) {
DISPLAY("Error: could not skip to end of block\n"); DISPLAY("Error: could not skip past checksum\n");
detectError = 1; detectError = 1;
break; break;
} }
} }
} while (lastBlock != 1); }
info->numActualFrames++;
if (detectError) { }
else if (magicNumber == ZSTD_MAGIC_SKIPPABLE_START) {
BYTE frameSizeBuffer[4];
size_t readBytes = fread(frameSizeBuffer, 1, 4, srcFile);
if (readBytes != 4) {
DISPLAY("There was an error reading skippable frame size");
detectError = 1;
break; break;
} }
} {
{ long const frameSize = MEM_readLE32(frameSizeBuffer);
/* check if checksum is used */ int const ret = fseek(srcFile, frameSize, SEEK_CUR);
BYTE const frameHeaderDescriptor = headerBuffer[4];
int const contentChecksumFlag = (frameHeaderDescriptor & (1 << 2)) >> 2;
if (contentChecksumFlag) {
info->usesCheck = 1;
}
if (contentChecksumFlag) {
int const ret = fseek(srcFile, 4, SEEK_CUR);
if (ret != 0) { if (ret != 0) {
DISPLAY("Error: could not skip past checksum\n"); DISPLAY("Error: could not find end of skippable frame\n");
detectError = 1; detectError = 1;
break; break;
} }
} }
info->numSkippableFrames++;
} }
info->numActualFrames++;
}
else if (magicNumber == ZSTD_MAGIC_SKIPPABLE_START) {
BYTE frameSizeBuffer[4];
size_t readBytes = fread(frameSizeBuffer, 1, 4, srcFile);
if (readBytes != 4) {
DISPLAY("There was an error reading skippable frame size");
detectError = 1;
break;
}
long const frameSize = MEM_readLE32(frameSizeBuffer);
{
int const ret = fseek(srcFile, frameSize, SEEK_CUR);
if (ret != 0) {
DISPLAY("Error: could not find end of skippable frame\n");
detectError = 1;
break;
}
}
fseek(srcFile, frameSize, SEEK_CUR);
info->numSkippableFrames++;
} }
} }
fclose(srcFile); fclose(srcFile);
@ -1036,8 +1036,8 @@ static void displayInfo(const char* inFileName, fileInfo_t* info, int displayLev
} }
int FIO_listFile(const char* inFileName, int displayLevel){ int FIO_listFile(const char* inFileName, int displayLevel){
DISPLAYOUT("File: %s\n", inFileName);
fileInfo_t info; fileInfo_t info;
DISPLAYOUT("File: %s\n", inFileName);
int const error = getFileInfo(&info, inFileName); int const error = getFileInfo(&info, inFileName);
if (error == 1) { if (error == 1) {
DISPLAY("An error occurred with getting file info\n"); DISPLAY("An error occurred with getting file info\n");