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

more refactoring for C90

Browse Source
This commit is contained in:
Paul Cruz 2017-06-12 17:09:08 -07:00
parent 618a7b66e2
commit 28dbf8ee6c
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
programs/fileio.c
View File

@ -955,14 +955,16 @@ int getFileInfo(fileInfo_t* info, const char* inFileName){
lastBlock = 0; lastBlock = 0;
do{ do{
BYTE blockHeaderBuffer[3]; BYTE blockHeaderBuffer[3];
U32 blockHeader;
int blockSize;
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");
exit(1); exit(1);
} }
U32 blockHeader = MEM_readLE24(blockHeaderBuffer); blockHeader = MEM_readLE24(blockHeaderBuffer);
lastBlock = blockHeader & 1; lastBlock = blockHeader & 1;
int blockSize = (blockHeader - (blockHeader & 7)) >> 3; blockSize = (blockHeader - (blockHeader & 7)) >> 3;
fseek(srcFile, blockSize, SEEK_CUR); fseek(srcFile, blockSize, SEEK_CUR);
}while(lastBlock != 1); }while(lastBlock != 1);
if(contentChecksumFlag){ if(contentChecksumFlag){
@ -970,14 +972,15 @@ int getFileInfo(fileInfo_t* info, const char* inFileName){
} }
} }
else if(magicNumber==ZSTD_MAGIC_SKIPPABLE_START){ else if(magicNumber==ZSTD_MAGIC_SKIPPABLE_START){
info->numSkippableFrames++;
BYTE frameSizeBuffer[4]; BYTE frameSizeBuffer[4];
long frameSize;
info->numSkippableFrames++;
size_t readBytes = fread(frameSizeBuffer, 1, 4, srcFile); size_t readBytes = fread(frameSizeBuffer, 1, 4, srcFile);
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); exit(1);
} }
long frameSize = MEM_readLE32(frameSizeBuffer); frameSize = MEM_readLE32(frameSizeBuffer);
fseek(srcFile, frameSize, SEEK_CUR); fseek(srcFile, frameSize, SEEK_CUR);
} }
@ -986,14 +989,16 @@ int getFileInfo(fileInfo_t* info, const char* inFileName){
} }
int FIO_listFile(const char* inFileName, int displayLevel){ int FIO_listFile(const char* inFileName, int displayLevel){
DISPLAY("FILE DETECTED: %s\n", inFileName);
const char* const suffixPtr = strrchr(inFileName, '.'); const char* const suffixPtr = strrchr(inFileName, '.');
DISPLAY("FILE DETECTED: %s\n", inFileName);
if(!suffixPtr || strcmp(suffixPtr, ZSTD_EXTENSION)){ if(!suffixPtr || strcmp(suffixPtr, ZSTD_EXTENSION)){
DISPLAYLEVEL(1, "file %s was not compressed with zstd -- ignoring\n", inFileName); DISPLAYLEVEL(1, "file %s was not compressed with zstd -- ignoring\n", inFileName);
DISPLAY("\n"); DISPLAY("\n");
return 1; return 1;
} }
else{ else{
double compressedSizeMB;
double decompressedSizeMB;
fileInfo_t* info = (fileInfo_t*)malloc(sizeof(fileInfo_t)); fileInfo_t* info = (fileInfo_t*)malloc(sizeof(fileInfo_t));
int error = getFileInfo(info, inFileName); int error = getFileInfo(info, inFileName);
if(error==1){ if(error==1){
@ -1001,8 +1006,8 @@ int FIO_listFile(const char* inFileName, int displayLevel){
exit(1); exit(1);
} }
double compressedSizeMB = (double)info->compressedSize/(1 MB); compressedSizeMB = (double)info->compressedSize/(1 MB);
double decompressedSizeMB = (double)info->decompressedSize/(1 MB); decompressedSizeMB = (double)info->decompressedSize/(1 MB);
if(displayLevel<=2){ if(displayLevel<=2){
DISPLAY("Skippable Non-Skippable Compressed Uncompressed Ratio Check Filename\n"); DISPLAY("Skippable Non-Skippable Compressed Uncompressed Ratio Check Filename\n");