made some small changes to dictInfo struct and initDictInfo

This commit is contained in:
Paul Cruz
2017-06-19 16:05:05 -07:00
parent 1ee4f6b36c
commit b91b810c64
+13 -12
View File
@@ -237,8 +237,9 @@ typedef struct {
int useDict; int useDict;
U32 dictID; U32 dictID;
size_t dictSize; size_t dictSize;
BYTE* fullDict;
BYTE* dictContent; BYTE* dictContent;
} dictOptions; } dictInfo;
/*-******************************************************* /*-*******************************************************
* Generator Functions * Generator Functions
*********************************************************/ *********************************************************/
@@ -1326,6 +1327,17 @@ static int genRandomDict(U32 dictID, U32 seed, size_t dictSize, BYTE* fullDict){
return 0; return 0;
} }
static dictInfo initDictInfo(int useDict, size_t dictSize, BYTE* fullDict, U32 seed){
/* allocate space statically */
dictInfo dictOp;
memset((void*)(&dictOp), 0, sizeof(dictOp));
dictOp.useDict = useDict;
dictOp.dictSize = dictSize;
dictOp.fullDict = fullDict;
dictOp.dictContent = fullDict + dictSize/4;
if (useDict) dictOp.dictID = RAND(&seed);
return dictOp;
}
/*-******************************************************* /*-*******************************************************
* File I/O * File I/O
*********************************************************/ *********************************************************/
@@ -1381,17 +1393,6 @@ static int generateCorpus(U32 seed, unsigned numFiles, const char* const path,
return 0; return 0;
} }
static dictOptions initDictOptions(int useDict, U32 dictID, size_t dictSize, BYTE* dictContent){
/* allocate space statically */
dictOptions dictOp;
memset((void*)(&dictOp), 0, sizeof(dictOp));
dictOp.useDict = useDict;
dictOp.dictID = dictID;
dictOp.dictSize = dictSize;
dictOp.dictContent = dictContent;
return dictOp;
}
static int generateCorpusWithDict(U32 seed, unsigned numFiles, const char* const path, static int generateCorpusWithDict(U32 seed, unsigned numFiles, const char* const path,
const char* const origPath, const size_t dictSize) const char* const origPath, const size_t dictSize)
{ {