From 311bcd2aa4dfc3cdef42f2bfdcc790fbaa3f39c5 Mon Sep 17 00:00:00 2001 From: dsandersoremutah Date: Tue, 10 Oct 2006 15:15:32 +0000 Subject: [PATCH] Changed several places that needed to access pDbInfo->pProgress instead of just Progress. git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@975 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- flaim/src/flchkdb.cpp | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/flaim/src/flchkdb.cpp b/flaim/src/flchkdb.cpp index 1c48e70..15ee68f 100644 --- a/flaim/src/flchkdb.cpp +++ b/flaim/src/flchkdb.cpp @@ -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); }