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

XFLAIM changes. Minor changes needed due to FTK updates.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@734 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
ahodgkinson
2006-08-03 19:25:44 +00:00
parent 19c68c08bc
commit 2c4c834092
7 changed files with 79 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
xflaim/src/flbackup.cpp
View File

@@ -1086,7 +1086,7 @@ RCODE F_DbSystem::dbRestore(
goto Exit;
}
if( RC_BAD( rc = SFileClient.setup( pszDbPath, pszDataDir)))
if( RC_BAD( rc = SFileClient.setup( pszDbPath, pszDataDir, 0)))
{
goto Exit;
}
@@ -1559,19 +1559,9 @@ FSTATIC RCODE flmRestoreFile(
rc = RC_SET_AND_ASSERT( NE_XFLM_INCONSISTENT_BACKUP);
goto Exit;
}
uiMaxFileSize = (FLMUINT)pDbHdr->ui32MaxFileSize;
// Set the database version number and block size into the
// super file handle. We only do this if the file being restored
// is the full backup. It will always be first in the restore sequence,
// and thus we only need to set these values into the super file handle
// at that time.
if( !bIncremental)
{
pSFile->setBlockSize( uiBlockSize);
}
// Make sure the maximum block file size matches what was read from the
// backup header.