lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-08-01 09:47:01 +03:00
Code Activity

Adjust function signatures

Browse Source
This commit is contained in:
senhuang42
2020-09-07 13:13:05 -04:00
parent 28a9dc78c3
commit 5123496104
3 changed files with 45 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
programs/fileio.c
View File

@ -830,7 +830,7 @@ static void FIO_adjustMemLimitForPatchFromMode(FIO_prefs_t* const prefs,
* If neither flag is specified, zstd will prompt the user for confirmation to proceed. * If neither flag is specified, zstd will prompt the user for confirmation to proceed.
* If --rm is not specified, then zstd will print a warning to the user (which can be silenced with -q). * If --rm is not specified, then zstd will print a warning to the user (which can be silenced with -q).
*/ */
static int FIO_removeMultiFilesWarning(const FIO_prefs_t* const prefs, FIO_ctx_t* const fCtx, int displayLevelCutoff, const char* outFileName) static int FIO_removeMultiFilesWarning(FIO_ctx_t* const fCtx, const FIO_prefs_t* const prefs, const char* outFileName, int displayLevelCutoff)
{ {
int error = 0; int error = 0;
if (fCtx->nbFilesTotal > 1 && !prefs->overwrite) { if (fCtx->nbFilesTotal > 1 && !prefs->overwrite) {
@ -1252,8 +1252,8 @@ FIO_compressLz4Frame(cRess_t* ress,
static unsigned long long static unsigned long long
FIO_compressZstdFrame(FIO_prefs_t* const prefs, FIO_compressZstdFrame(FIO_ctx_t* const fCtx,
FIO_ctx_t* const fCtx, FIO_prefs_t* const prefs,
const cRess_t* ressPtr, const cRess_t* ressPtr,
const char* srcFileName, U64 fileSize, const char* srcFileName, U64 fileSize,
int compressionLevel, U64* readsize) int compressionLevel, U64* readsize)
@ -1455,8 +1455,8 @@ FIO_compressZstdFrame(FIO_prefs_t* const prefs,
* 1 : missing or pb opening srcFileName * 1 : missing or pb opening srcFileName
*/ */
static int static int
FIO_compressFilename_internal(FIO_prefs_t* const prefs, FIO_compressFilename_internal(FIO_ctx_t* const fCtx,
FIO_ctx_t* const fCtx, FIO_prefs_t* const prefs,
cRess_t ress, cRess_t ress,
const char* dstFileName, const char* srcFileName, const char* dstFileName, const char* srcFileName,
int compressionLevel) int compressionLevel)
@ -1472,7 +1472,7 @@ FIO_compressFilename_internal(FIO_prefs_t* const prefs,
switch (prefs->compressionType) { switch (prefs->compressionType) {
default: default:
case FIO_zstdCompression: case FIO_zstdCompression:
compressedfilesize = FIO_compressZstdFrame(prefs, fCtx, &ress, srcFileName, fileSize, compressionLevel, &readsize); compressedfilesize = FIO_compressZstdFrame(fCtx, prefs, &ress, srcFileName, fileSize, compressionLevel, &readsize);
break; break;
case FIO_gzipCompression: case FIO_gzipCompression:
@ -1550,8 +1550,8 @@ FIO_compressFilename_internal(FIO_prefs_t* const prefs,
* @return : 0 : compression completed correctly, * @return : 0 : compression completed correctly,
* 1 : pb * 1 : pb
*/ */
static int FIO_compressFilename_dstFile(FIO_prefs_t* const prefs, static int FIO_compressFilename_dstFile(FIO_ctx_t* const fCtx,
FIO_ctx_t* const fCtx, FIO_prefs_t* const prefs,
cRess_t ress, cRess_t ress,
const char* dstFileName, const char* dstFileName,
const char* srcFileName, const char* srcFileName,
@ -1579,7 +1579,7 @@ static int FIO_compressFilename_dstFile(FIO_prefs_t* const prefs,
transfer_permissions = 1; transfer_permissions = 1;
} }
result = FIO_compressFilename_internal(prefs, fCtx, ress, dstFileName, srcFileName, compressionLevel); result = FIO_compressFilename_internal(fCtx, prefs, ress, dstFileName, srcFileName, compressionLevel);
if (closeDstFile) { if (closeDstFile) {
FILE* const dstFile = ress.dstFile; FILE* const dstFile = ress.dstFile;
@ -1628,8 +1628,8 @@ static const char *compressedFileExtensions[] = {
* 1 : missing or pb opening srcFileName * 1 : missing or pb opening srcFileName
*/ */
static int static int
FIO_compressFilename_srcFile(FIO_prefs_t* const prefs, FIO_compressFilename_srcFile(FIO_ctx_t* const fCtx,
FIO_ctx_t* const fCtx, FIO_prefs_t* const prefs,
cRess_t ress, cRess_t ress,
const char* dstFileName, const char* dstFileName,
const char* srcFileName, const char* srcFileName,
@ -1662,7 +1662,7 @@ FIO_compressFilename_srcFile(FIO_prefs_t* const prefs,
ress.srcFile = FIO_openSrcFile(srcFileName); ress.srcFile = FIO_openSrcFile(srcFileName);
if (ress.srcFile == NULL) return 1; /* srcFile could not be opened */ if (ress.srcFile == NULL) return 1; /* srcFile could not be opened */
result = FIO_compressFilename_dstFile(prefs, fCtx, ress, dstFileName, srcFileName, compressionLevel); result = FIO_compressFilename_dstFile(fCtx, prefs, ress, dstFileName, srcFileName, compressionLevel);
fclose(ress.srcFile); fclose(ress.srcFile);
ress.srcFile = NULL; ress.srcFile = NULL;
@ -1680,12 +1680,12 @@ FIO_compressFilename_srcFile(FIO_prefs_t* const prefs,
return result; return result;
} }
int FIO_compressFilename(FIO_prefs_t* const prefs, FIO_ctx_t* const fCtx, const char* dstFileName, int FIO_compressFilename(FIO_ctx_t* const fCtx, FIO_prefs_t* const prefs, const char* dstFileName,
const char* srcFileName, const char* dictFileName, const char* srcFileName, const char* dictFileName,
int compressionLevel, ZSTD_compressionParameters comprParams) int compressionLevel, ZSTD_compressionParameters comprParams)
{ {
cRess_t const ress = FIO_createCResources(prefs, dictFileName, UTIL_getFileSize(srcFileName), compressionLevel, comprParams); cRess_t const ress = FIO_createCResources(prefs, dictFileName, UTIL_getFileSize(srcFileName), compressionLevel, comprParams);
int const result = FIO_compressFilename_srcFile(prefs, fCtx, ress, dstFileName, srcFileName, compressionLevel); int const result = FIO_compressFilename_srcFile(fCtx, prefs, ress, dstFileName, srcFileName, compressionLevel);
#define DISPLAY_LEVEL_DEFAULT 2 #define DISPLAY_LEVEL_DEFAULT 2
@ -1750,8 +1750,8 @@ static unsigned long long FIO_getLargestFileSize(const char** inFileNames, unsig
* or into one file each (outFileName == NULL, but suffix != NULL), * or into one file each (outFileName == NULL, but suffix != NULL),
* or into a destination folder (specified with -O) * or into a destination folder (specified with -O)
*/ */
int FIO_compressMultipleFilenames(FIO_prefs_t* const prefs, int FIO_compressMultipleFilenames(FIO_ctx_t* const fCtx,
FIO_ctx_t* const fCtx, FIO_prefs_t* const prefs,
const char** inFileNamesTable, const char** inFileNamesTable,
const char* outMirroredRootDirName, const char* outMirroredRootDirName,
const char* outDirName, const char* outDirName,
@ -1768,7 +1768,7 @@ int FIO_compressMultipleFilenames(FIO_prefs_t* const prefs,
/* init */ /* init */
assert(outFileName != NULL || suffix != NULL); assert(outFileName != NULL || suffix != NULL);
if (outFileName != NULL) { /* output into a single destination (stdout typically) */ if (outFileName != NULL) { /* output into a single destination (stdout typically) */
if (FIO_removeMultiFilesWarning(prefs, fCtx, 1 /* displayLevelCutoff */, outFileName)) { if (FIO_removeMultiFilesWarning(fCtx, prefs, outFileName, 1 /* displayLevelCutoff */)) {
FIO_freeCResources(ress); FIO_freeCResources(ress);
return 1; return 1;
} }
@ -1777,7 +1777,7 @@ int FIO_compressMultipleFilenames(FIO_prefs_t* const prefs,
error = 1; error = 1;
} else { } else {
for (; fCtx->currFileIdx < fCtx->nbFilesTotal; ++fCtx->currFileIdx) { for (; fCtx->currFileIdx < fCtx->nbFilesTotal; ++fCtx->currFileIdx) {
status = FIO_compressFilename_srcFile(prefs, fCtx, ress, outFileName, inFileNamesTable[fCtx->currFileIdx], compressionLevel); status = FIO_compressFilename_srcFile(fCtx, prefs, ress, outFileName, inFileNamesTable[fCtx->currFileIdx], compressionLevel);
if (!status) fCtx->nbFilesProcessed++; if (!status) fCtx->nbFilesProcessed++;
error |= status; error |= status;
} }
@ -1806,7 +1806,7 @@ int FIO_compressMultipleFilenames(FIO_prefs_t* const prefs,
} else { } else {
dstFileName = FIO_determineCompressedName(srcFileName, outDirName, suffix); /* cannot fail */ dstFileName = FIO_determineCompressedName(srcFileName, outDirName, suffix); /* cannot fail */
} }
status = FIO_compressFilename_srcFile(prefs, fCtx, ress, dstFileName, srcFileName, compressionLevel); status = FIO_compressFilename_srcFile(fCtx, prefs, ress, dstFileName, srcFileName, compressionLevel);
if (!status) fCtx->nbFilesProcessed++; if (!status) fCtx->nbFilesProcessed++;
error |= status; error |= status;
} }
@ -2051,9 +2051,8 @@ FIO_zstdErrorHelp(const FIO_prefs_t* const prefs,
*/ */
#define FIO_ERROR_FRAME_DECODING ((unsigned long long)(-2)) #define FIO_ERROR_FRAME_DECODING ((unsigned long long)(-2))
static unsigned long long static unsigned long long
FIO_decompressZstdFrame(dRess_t* ress, FILE* finput, FIO_decompressZstdFrame(FIO_ctx_t* const fCtx, dRess_t* ress, FILE* finput,
const FIO_prefs_t* const prefs, const FIO_prefs_t* const prefs,
FIO_ctx_t* const fCtx,
const char* srcFileName, const char* srcFileName,
U64 alreadyDecoded) /* for multi-frames streams */ U64 alreadyDecoded) /* for multi-frames streams */
{ {
@ -2354,9 +2353,9 @@ FIO_decompressLz4Frame(dRess_t* ress, FILE* srcFile,
* @return : 0 : OK * @return : 0 : OK
* 1 : error * 1 : error
*/ */
static int FIO_decompressFrames(dRess_t ress, FILE* srcFile, static int FIO_decompressFrames(FIO_ctx_t* const fCtx,
dRess_t ress, FILE* srcFile,
const FIO_prefs_t* const prefs, const FIO_prefs_t* const prefs,
FIO_ctx_t* const fCtx,
const char* dstFileName, const char* srcFileName) const char* dstFileName, const char* srcFileName)
{ {
unsigned readSomething = 0; unsigned readSomething = 0;
@ -2384,7 +2383,7 @@ static int FIO_decompressFrames(dRess_t ress, FILE* srcFile,
return 1; return 1;
} }
if (ZSTD_isFrame(buf, ress.srcBufferLoaded)) { if (ZSTD_isFrame(buf, ress.srcBufferLoaded)) {
unsigned long long const frameSize = FIO_decompressZstdFrame(&ress, srcFile, prefs, fCtx, srcFileName, filesize); unsigned long long const frameSize = FIO_decompressZstdFrame(fCtx, &ress, srcFile, prefs, srcFileName, filesize);
if (frameSize == FIO_ERROR_FRAME_DECODING) return 1; if (frameSize == FIO_ERROR_FRAME_DECODING) return 1;
filesize += frameSize; filesize += frameSize;
} else if (buf[0] == 31 && buf[1] == 139) { /* gz magic number */ } else if (buf[0] == 31 && buf[1] == 139) { /* gz magic number */
@ -2445,8 +2444,8 @@ static int FIO_decompressFrames(dRess_t ress, FILE* srcFile,
@return : 0 : OK @return : 0 : OK
1 : operation aborted 1 : operation aborted
*/ */
static int FIO_decompressDstFile(FIO_prefs_t* const prefs, static int FIO_decompressDstFile(FIO_ctx_t* const fCtx,
FIO_ctx_t* const fCtx, FIO_prefs_t* const prefs,
dRess_t ress, FILE* srcFile, dRess_t ress, FILE* srcFile,
const char* dstFileName, const char* srcFileName) const char* dstFileName, const char* srcFileName)
{ {
@ -2473,7 +2472,7 @@ static int FIO_decompressDstFile(FIO_prefs_t* const prefs,
transfer_permissions = 1; transfer_permissions = 1;
} }
result = FIO_decompressFrames(ress, srcFile, prefs, fCtx, dstFileName, srcFileName); result = FIO_decompressFrames(fCtx, ress, srcFile, prefs, dstFileName, srcFileName);
if (releaseDstFile) { if (releaseDstFile) {
FILE* const dstFile = ress.dstFile; FILE* const dstFile = ress.dstFile;
@ -2502,7 +2501,7 @@ static int FIO_decompressDstFile(FIO_prefs_t* const prefs,
@return : 0 : OK @return : 0 : OK
1 : error 1 : error
*/ */
static int FIO_decompressSrcFile(FIO_prefs_t* const prefs, FIO_ctx_t* const fCtx, dRess_t ress, const char* dstFileName, const char* srcFileName) static int FIO_decompressSrcFile(FIO_ctx_t* const fCtx, FIO_prefs_t* const prefs, dRess_t ress, const char* dstFileName, const char* srcFileName)
{ {
FILE* srcFile; FILE* srcFile;
int result; int result;
@ -2516,7 +2515,7 @@ static int FIO_decompressSrcFile(FIO_prefs_t* const prefs, FIO_ctx_t* const fCtx
if (srcFile==NULL) return 1; if (srcFile==NULL) return 1;
ress.srcBufferLoaded = 0; ress.srcBufferLoaded = 0;
result = FIO_decompressDstFile(prefs, fCtx, ress, srcFile, dstFileName, srcFileName); result = FIO_decompressDstFile(fCtx, prefs, ress, srcFile, dstFileName, srcFileName);
/* Close file */ /* Close file */
if (fclose(srcFile)) { if (fclose(srcFile)) {
@ -2540,13 +2539,13 @@ static int FIO_decompressSrcFile(FIO_prefs_t* const prefs, FIO_ctx_t* const fCtx
int FIO_decompressFilename(FIO_prefs_t* const prefs, FIO_ctx_t* const fCtx, int FIO_decompressFilename(FIO_ctx_t* const fCtx, FIO_prefs_t* const prefs,
const char* dstFileName, const char* srcFileName, const char* dstFileName, const char* srcFileName,
const char* dictFileName) const char* dictFileName)
{ {
dRess_t const ress = FIO_createDResources(prefs, dictFileName); dRess_t const ress = FIO_createDResources(prefs, dictFileName);
int const decodingError = FIO_decompressSrcFile(prefs, fCtx, ress, dstFileName, srcFileName); int const decodingError = FIO_decompressSrcFile(fCtx, prefs, ress, dstFileName, srcFileName);
FIO_freeDResources(ress); FIO_freeDResources(ress);
return decodingError; return decodingError;
@ -2671,8 +2670,8 @@ FIO_determineDstName(const char* srcFileName, const char* outDirName)
} }
int int
FIO_decompressMultipleFilenames(FIO_prefs_t* const prefs, FIO_decompressMultipleFilenames(FIO_ctx_t* const fCtx,
FIO_ctx_t* const fCtx, FIO_prefs_t* const prefs,
const char** srcNamesTable, const char** srcNamesTable,
const char* outMirroredRootDirName, const char* outMirroredRootDirName,
const char* outDirName, const char* outFileName, const char* outDirName, const char* outFileName,
@ -2683,7 +2682,7 @@ FIO_decompressMultipleFilenames(FIO_prefs_t* const prefs,
dRess_t ress = FIO_createDResources(prefs, dictFileName); dRess_t ress = FIO_createDResources(prefs, dictFileName);
if (outFileName) { if (outFileName) {
if (FIO_removeMultiFilesWarning(prefs, fCtx, 1 /* displayLevelCutoff */, outFileName)) { if (FIO_removeMultiFilesWarning(fCtx, prefs, outFileName, 1 /* displayLevelCutoff */)) {
FIO_freeDResources(ress); FIO_freeDResources(ress);
return 1; return 1;
} }
@ -2692,7 +2691,7 @@ FIO_decompressMultipleFilenames(FIO_prefs_t* const prefs,
if (ress.dstFile == 0) EXM_THROW(19, "cannot open %s", outFileName); if (ress.dstFile == 0) EXM_THROW(19, "cannot open %s", outFileName);
} }
for (; fCtx->currFileIdx < fCtx->nbFilesTotal; fCtx->currFileIdx++) { for (; fCtx->currFileIdx < fCtx->nbFilesTotal; fCtx->currFileIdx++) {
status = FIO_decompressSrcFile(prefs, fCtx, ress, outFileName, srcNamesTable[fCtx->currFileIdx]); status = FIO_decompressSrcFile(fCtx, prefs, ress, outFileName, srcNamesTable[fCtx->currFileIdx]);
if (!status) fCtx->nbFilesProcessed++; if (!status) fCtx->nbFilesProcessed++;
error |= status; error |= status;
} }
@ -2718,7 +2717,7 @@ FIO_decompressMultipleFilenames(FIO_prefs_t* const prefs,
dstFileName = FIO_determineDstName(srcFileName, outDirName); dstFileName = FIO_determineDstName(srcFileName, outDirName);
} }
if (dstFileName == NULL) { error=1; continue; } if (dstFileName == NULL) { error=1; continue; }
status = FIO_decompressSrcFile(prefs, fCtx, ress, dstFileName, srcFileName); status = FIO_decompressSrcFile(fCtx, prefs, ress, dstFileName, srcFileName);
if (!status) fCtx->nbFilesProcessed++; if (!status) fCtx->nbFilesProcessed++;
error |= status; error |= status;
} }

12
programs/fileio.h
View File

@ -112,14 +112,14 @@ void FIO_setNbFilesTotal(FIO_ctx_t* const fCtx, int value);
***************************************/ ***************************************/
/** FIO_compressFilename() : /** FIO_compressFilename() :
* @return : 0 == ok; 1 == pb with src file. */ * @return : 0 == ok; 1 == pb with src file. */
int FIO_compressFilename (FIO_prefs_t* const prefs, FIO_ctx_t* const fCtx, int FIO_compressFilename (FIO_ctx_t* const fCtx, FIO_prefs_t* const prefs,
const char* outfilename, const char* infilename, const char* outfilename, const char* infilename,
const char* dictFileName, int compressionLevel, const char* dictFileName, int compressionLevel,
ZSTD_compressionParameters comprParams); ZSTD_compressionParameters comprParams);
/** FIO_decompressFilename() : /** FIO_decompressFilename() :
* @return : 0 == ok; 1 == pb with src file. */ * @return : 0 == ok; 1 == pb with src file. */
int FIO_decompressFilename (FIO_prefs_t* const prefs, FIO_ctx_t* const fCtx, int FIO_decompressFilename (FIO_ctx_t* const fCtx, FIO_prefs_t* const prefs,
const char* outfilename, const char* infilename, const char* dictFileName); const char* outfilename, const char* infilename, const char* dictFileName);
int FIO_listMultipleFiles(unsigned numFiles, const char** filenameTable, int displayLevel); int FIO_listMultipleFiles(unsigned numFiles, const char** filenameTable, int displayLevel);
@ -130,8 +130,8 @@ int FIO_listMultipleFiles(unsigned numFiles, const char** filenameTable, int dis
***************************************/ ***************************************/
/** FIO_compressMultipleFilenames() : /** FIO_compressMultipleFilenames() :
* @return : nb of missing files */ * @return : nb of missing files */
int FIO_compressMultipleFilenames(FIO_prefs_t* const prefs, int FIO_compressMultipleFilenames(FIO_ctx_t* const fCtx,
FIO_ctx_t* const fCtx, FIO_prefs_t* const prefs,
const char** inFileNamesTable, const char** inFileNamesTable,
const char* outMirroredDirName, const char* outMirroredDirName,
const char* outDirName, const char* outDirName,
@ -141,8 +141,8 @@ int FIO_compressMultipleFilenames(FIO_prefs_t* const prefs,
/** FIO_decompressMultipleFilenames() : /** FIO_decompressMultipleFilenames() :
* @return : nb of missing or skipped files */ * @return : nb of missing or skipped files */
int FIO_decompressMultipleFilenames(FIO_prefs_t* const prefs, int FIO_decompressMultipleFilenames(FIO_ctx_t* const fCtx,
FIO_ctx_t* const fCtx, FIO_prefs_t* const prefs,
const char** srcNamesTable, const char** srcNamesTable,
const char* outMirroredDirName, const char* outMirroredDirName,
const char* outDirName, const char* outDirName,

8
programs/zstdcli.c
View File

@ -1320,9 +1320,9 @@ int main(int const argCount, const char* argv[])
} }
if ((filenames->tableSize==1) && outFileName) if ((filenames->tableSize==1) && outFileName)
operationResult = FIO_compressFilename(prefs, fCtx, outFileName, filenames->fileNames[0], dictFileName, cLevel, compressionParams); operationResult = FIO_compressFilename(fCtx, prefs, outFileName, filenames->fileNames[0], dictFileName, cLevel, compressionParams);
else else
operationResult = FIO_compressMultipleFilenames(prefs, fCtx, filenames->fileNames, outMirroredDirName, outDirName, outFileName, suffix, dictFileName, cLevel, compressionParams); operationResult = FIO_compressMultipleFilenames(fCtx, prefs, filenames->fileNames, outMirroredDirName, outDirName, outFileName, suffix, dictFileName, cLevel, compressionParams);
#else #else
(void)contentSize; (void)suffix; (void)adapt; (void)rsyncable; (void)ultra; (void)cLevel; (void)ldmFlag; (void)literalCompressionMode; (void)targetCBlockSize; (void)streamSrcSize; (void)srcSizeHint; (void)ZSTD_strategyMap; /* not used when ZSTD_NOCOMPRESS set */ (void)contentSize; (void)suffix; (void)adapt; (void)rsyncable; (void)ultra; (void)cLevel; (void)ldmFlag; (void)literalCompressionMode; (void)targetCBlockSize; (void)streamSrcSize; (void)srcSizeHint; (void)ZSTD_strategyMap; /* not used when ZSTD_NOCOMPRESS set */
DISPLAY("Compression not supported \n"); DISPLAY("Compression not supported \n");
@ -1330,9 +1330,9 @@ int main(int const argCount, const char* argv[])
} else { /* decompression or test */ } else { /* decompression or test */
#ifndef ZSTD_NODECOMPRESS #ifndef ZSTD_NODECOMPRESS
if (filenames->tableSize == 1 && outFileName) { if (filenames->tableSize == 1 && outFileName) {
operationResult = FIO_decompressFilename(prefs, fCtx, outFileName, filenames->fileNames[0], dictFileName); operationResult = FIO_decompressFilename(fCtx, prefs, outFileName, filenames->fileNames[0], dictFileName);
} else { } else {
operationResult = FIO_decompressMultipleFilenames(prefs, fCtx, filenames->fileNames, outMirroredDirName, outDirName, outFileName, dictFileName); operationResult = FIO_decompressMultipleFilenames(fCtx, prefs, filenames->fileNames, outMirroredDirName, outDirName, outFileName, dictFileName);
} }
#else #else
DISPLAY("Decompression not supported \n"); DISPLAY("Decompression not supported \n");