diff -r fa9941cf3867 -r 667e88a979d7 persistentstorage/sql/SRC/Server/SqlSrvFileData.cpp --- a/persistentstorage/sql/SRC/Server/SqlSrvFileData.cpp Fri Mar 12 15:51:02 2010 +0200 +++ b/persistentstorage/sql/SRC/Server/SqlSrvFileData.cpp Mon Mar 15 12:46:30 2010 +0200 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -196,12 +196,18 @@ { __SQLASSERT((TUint)aFileNameArgNum < KMaxMessageArguments, ESqlPanicBadArgument); __SQLASSERT(iSysDrivePrivatePath.DriveAndPath().Length() > 0, ESqlPanicInternalError); - + if(aFileNameLen < 1 || aFileNameLen > KMaxFileName) { __SQLLEAVE(KErrBadName); } +#ifdef SQLSRV_STARTUP_TEST + aMessage.Int0();//prevents compiler warning + aFileNameArgNum = aFileNameArgNum;//prevents compiler warning + iFileName.Copy(*(const TDesC*)aConfigStr); +#else aMessage.ReadL(aFileNameArgNum, iFileName); +#endif SQLPROFILER_REPORT_IPC(ESqlIpcRead, (aFileNameLen * sizeof(TText))); TParse parsedFileName; __SQLLEAVE_IF_ERROR(parsedFileName.Set(iFileName, 0, 0));//prophylactic check, leave if the file name cannot be parsed @@ -217,7 +223,9 @@ ::CreatePrivateDataPathL(iFs, iDrive); } iReadOnly = ::IsReadOnlyFileL(iFs, FileName()); +#ifndef SQLSRV_STARTUP_TEST ::ExtractConfigParamsL(aConfigStr, iConfigParams, iConfig); +#endif } /**