mars_nwe/mars-flaim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed several places that needed to access pDbInfo->pProgress instead of just Progress.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@975 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
dsandersoremutah
2006-10-10 15:15:32 +00:00
parent 8195c9f00b
commit 311bcd2aa4
1 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
flaim/src/flchkdb.cpp
View File

@@ -509,22 +509,12 @@ Begin_Check:
bStartOver = FALSE;
pPool->poolReset( pvDbInfoMark);
pDbInfo->pProgress->bPhysicalCorrupt = FALSE;
pDbInfo->pProgress->bLogicalIndexCorrupt = FALSE;
pDbInfo->pProgress->ui64DatabaseSize = 0;
pDbInfo->pProgress->uiNumFields = 0;
pDbInfo->pProgress->uiNumIndexes = 0;
pDbInfo->pProgress->uiNumContainers = 0;
pDbInfo->pProgress->uiNumLogicalFiles = 0;
f_memset( pDbInfo->pProgress, 0, sizeof(DB_CHECK_PROGRESS));
pDbInfo->pLogicalFiles = NULL;
pDbInfo->pProgress->pLfStats = NULL;
pDbInfo->uiFlags = uiCheckFlags;
pDbInfo->bStartedUpdateTrans = FALSE;
f_memset( &pDbInfo->pProgress->AvailBlocks, 0, sizeof(BLOCK_INFO));
f_memset( &pDbInfo->pProgress->LFHBlocks, 0, sizeof(BLOCK_INFO));
f_memset( &pDbInfo->FileHdr, 0, sizeof(FILE_HDR));
f_memset( &Progress, 0, sizeof(DB_CHECK_PROGRESS));
Progress.AppArg = AppArg;
pDbInfo->pProgress->AppArg = AppArg;
// Get the dictionary information for the file
@@ -533,8 +523,6 @@ Begin_Check:
goto Exit;
}
Progress.ui64BytesExamined = 0;
for (uiLoop = 1;
uiLoop <= MAX_DATA_BLOCK_FILE_NUMBER( pDb->pFile->FileHdr.uiVersionNum);
uiLoop++)
@@ -544,7 +532,7 @@ Begin_Check:
break;
}
Progress.ui64DatabaseSize += ui64TmpSize;
pDbInfo->pProgress->ui64DatabaseSize += ui64TmpSize;
}
// See if we have a valid end of file
@@ -558,10 +546,10 @@ Begin_Check:
goto Exit;
}
}
else if (Progress.ui64DatabaseSize < FSGetSizeInBytes( pDbInfo->pDb->pFile->uiMaxFileSize,
else if (pDbInfo->pProgress->ui64DatabaseSize < FSGetSizeInBytes( pDbInfo->pDb->pFile->uiMaxFileSize,
uiFileEnd))
{
Progress.ui64DatabaseSize = FSGetSizeInBytes( pDbInfo->pDb->pFile->uiMaxFileSize,
pDbInfo->pProgress->ui64DatabaseSize = FSGetSizeInBytes( pDbInfo->pDb->pFile->uiMaxFileSize,
uiFileEnd);
}