FCL/sf/os/kernelhwsrv: comparison kernel/eka/drivers/hcr/hcr

equal deleted inserted replaced

-:0bf4040442f9
+:46fffbe7b5a7
 }
 HCR::HCRInternal::~HCRInternal()
 {
 HCR_FUNC("~HCRInternal");
+if (iVariant)
+		{
+		delete iVariant;
+	iVariant =0;
+	}
+if (iVariantStore)
+		{
+		delete iVariantStore;
+	iVariantStore =0;
+	}
+if (iCoreImgStore)
+		{
+		delete iCoreImgStore;
+	iCoreImgStore =0;
+	}
+if (iOverrideStore)
+		{
+		delete iOverrideStore;
+	iOverrideStore =0;
+	}
 }
 TUint32 HCR::HCRInternal::GetStatus()
 {
 HCR_FUNC("GetStatus");
 TInt HCR::HCRInternal::FindSetting(const TSettingId& aId, TSettingType aType,
 TSettingRef& aSetting)
 {
 HCR_FUNC("HCRInternal::FindSetting");
-TInt err = 0;
+TInt err = KErrNone;
 TBool found = EFalse;
 HCR_TRACE3("--- Repository state: %x, %x, %x", iOverrideStore, iCoreImgStore, iVariantStore);
 if (iOverrideStore &&
 ((err = iOverrideStore->FindSetting(aId, aSetting)) == KErrNone))
 found = ETrue;
-if ((err != KErrNone) && (err != KErrNotFound))
+__NK_ASSERT_DEBUG(err == KErrNotFound || err == KErrNone);
-HCR_TRACE_RETURN(err);
 if (!found &&
 iCoreImgStore &&
 ((err = iCoreImgStore->FindSetting(aId, aSetting)) == KErrNone))
 found = ETrue;
-if ((err != KErrNone) && (err != KErrNotFound))
+__NK_ASSERT_DEBUG(err == KErrNotFound || err == KErrNone);
-HCR_TRACE_RETURN(err);
 if (!found &&
 iVariantStore &&
 ((err = iVariantStore->FindSetting(aId, aSetting)) == KErrNone))
 found = ETrue;
+__NK_ASSERT_DEBUG(err == KErrNotFound || err == KErrNone);
-if ((err != KErrNone) && (err != KErrNotFound))
-HCR_TRACE_RETURN(err);
 HCR_TRACE3("--- Search results: %d, %d, %x", found, err, aSetting.iSet);
-if (!found || (aSetting.iSet == 0))
+if (!found)
 HCR_TRACE_RETURN(KErrNotFound);
+// aSetting should now point to the found setting
+__NK_ASSERT_DEBUG(aSetting.iSet != 0);
 // Setting found at this point in the function
 //
 TSettingType type=static_cast<TSettingType>(aSetting.iRep->GetType(aSetting));
 if (type & ~aType)
 HCR_TRACE_RETURN(KErrArgument); // Wrong setting type
 HCR_TRACE3("--- Setting found! ID: (%d,%d) Type: %d", aId.iCat, aId.iKey, type);
-return KErrNone;
+return err;
 }
 TInt HCR::HCRInternal::FindSettingWithType(const TSettingId& aId, TSettingType& aType,
 TSettingRef& aSetting)
 {
 HCR_FUNC("HCRInternal::FindSettingWithType");
-TInt err = 0;
+TInt err = KErrNone;
 TBool found = EFalse;
 HCR_TRACE3("--- Repository state: %x, %x, %x", iOverrideStore, iCoreImgStore, iVariantStore);
 if (iOverrideStore &&
 ((err = iOverrideStore->FindSetting(aId, aSetting)) == KErrNone))
 found = ETrue;
-if ((err != KErrNone) && (err != KErrNotFound))
+__NK_ASSERT_DEBUG(err == KErrNotFound || err == KErrNone);
-HCR_TRACE_RETURN(err);
 if (!found &&
 iCoreImgStore &&
 ((err = iCoreImgStore->FindSetting(aId, aSetting)) == KErrNone))
 found = ETrue;
-if ((err != KErrNone) && (err != KErrNotFound))
+__NK_ASSERT_DEBUG(err == KErrNotFound || err == KErrNone);
-HCR_TRACE_RETURN(err);
 if (!found &&
 iVariantStore &&
 ((err = iVariantStore->FindSetting(aId, aSetting)) == KErrNone))
 found = ETrue;
+__NK_ASSERT_DEBUG(err == KErrNotFound || err == KErrNone);
-if ((err != KErrNone) && (err != KErrNotFound))
-HCR_TRACE_RETURN(err);
 HCR_TRACE3("--- Search results: %d, %d, %x", found, err, aSetting.iSet);
-if (!found || (aSetting.iSet == 0))
+if (!found)
 {
 aType = ETypeUndefined;
 HCR_TRACE_RETURN(KErrNotFound);
 }
+// aSetting should now point to the found setting
+__NK_ASSERT_DEBUG(aSetting.iSet != 0);
 // Setting found at this point in the function
 //
 aType=static_cast<TSettingType>(aSetting.iRep->GetType(aSetting));
 HCR_TRACE3("--- Setting found! ID: (%d,%d) Type: %d", aId.iCat, aId.iKey, aType);
-return KErrNone;
+return err;
 }
 TInt HCR::HCRInternal::GetWordSettings(TInt aNum, const SSettingId aIds[],
 TInt32 aValues[], TSettingType aTypes[], TInt aErrors[])
 {
 //if the element is found in the Override store, then store the posi-
 //tion of this element in lowIndex, to narrow next search procedure
 lowIndex = elementPos;
 }
-else if(err == KErrNotFound)
+else //err == KErrNotFound
 {
 //if element is not found then it means it's not redefined in the
 //Override store and this element must be counted in the total number
 //of elemnts in all stores
 cCount ++;
+//FindSetting can only return KErrNotFound, let's assert
+//we've only got KErrNotFound
+__NK_ASSERT_DEBUG(err == KErrNotFound);
 }
-else
-{
-return err;
-}
 }
 }
 else
 {
 cCount = cLength;
 }
-//Check if the Variant store is present if it's not then just return the
-//result
-if(!iVariantStore)
-return (oCount + cCount);
 }
 //First and last element index within giving category in the Variant store
 TInt32 vLowIndex  = 0;
 vLength = 0;
 else
 //Calculate the number of elements within category, in CoreImg store
 vLength = vHighIndex - vLowIndex + 1;
-if(oCount == 0 && cCount == 0)
-{
-return vLength;
-}
 if(oCount > 0 || cCount >0)
 {
 //Find all elemnts from Variant store which are not redefined either in the
 //Override or CoreImg store. These elements are added to the total
 //if the element is found in the Override store, then store the posi-
 //tion of this element in lowIndex, to narrow next search procedure
 lowIndex = elementPos;
 isRedefined = ETrue;
 }
-else if(err == KErrNotFound)
+else //err == KErrNotFound
 {
 //the element is not presented in the Override store
 //nothing to do here
+//FindSetting can only return KErrNotFound, let's assert
+//we've only got KErrNotFound
+__NK_ASSERT_DEBUG(err == KErrNotFound);
 }
-else
-{
-return err;
-}
 }
 if(cCount > 0 && !isRedefined)
 //if the element is found in the Override store, then store the posi-
 //tion of this element in lowIndex, to narrow next search procedure
 lowIndex2 = elementPos2;
 isRedefined = ETrue;
 }
-else if(err == KErrNotFound)
+else //err == KErrNotFound
 {
 //the element is not presented in the Override store
 //nothing to do here
+//FindSetting can only return KErrNotFound, let's assert
+//we've only got KErrNotFound
+__NK_ASSERT_DEBUG(err == KErrNotFound);
 }
-else
-{
-return err;
-}
 }
 if(!isRedefined)
 vCount ++;
 HCR_TRACE3("--- Repository state: %x, %x, %x", iOverrideStore,
 iCoreImgStore, iVariantStore);
 //Error container
 TInt err = KErrNone;
-//Total number of found elements
-TInt numFound = 0;
 //Number of found elements in the Override store
 TInt oNumFound = 0;
 //Low and High indexes in the Override store
 TInt32 oLoIndex = 0;
 aIds[index],
 aTypes ? aTypes[index]:tmpType,
 aLens  ? aLens[index]:tmpLen);
 }
-return oNumFound;
+return aMaxNum;
 }
 }
-else if(err == KErrNotFound)
+else // err == KErrNotFound
 {
 //Nothing to do here, oNumFound is set to zero already
-}
-else
+//FindNumSettingsInCategory can only return KErrNotFound, let's
-{
+//assert we've only got KErrNotFound
-return err;
+__NK_ASSERT_DEBUG(err == KErrNotFound);
 }
 }
 //Low/High index in the CoreImg
 TInt32 cLoIndex = 0;
 if(err == KErrNone)
 {
 lowIndex = elementPos + 1;
 isRedefined = ETrue;
 }
-else if (err == KErrNotFound)
+else //err == KErrNotFound
 {
 //Nothing to do hear, isRedefined flag is EFalse
 //all analysis is done later in the code
+//FindSetting can only return KErrNotFound, let's assert
+//we've only got KErrNotFound
+__NK_ASSERT_DEBUG(err == KErrNotFound);
 }
-else
-{
-return err;
-}
 }
 //Examine the redefined status flag
 if(!isRedefined)
 {
 aLens ? aLens[usrArrIndx]:tmpLen);
 cNumFound ++;
 }
 else
 {
-//All required elements were found!
-//As vNumFound was used an index so it's value it runs
-//from 0 to X-1, where X - number of found elements. To
-//get number of elements found we need increase the last
-//counter value by 1.
-if(cNumFound != 0)
-cNumFound ++;
 //It reaches the goal, all required elements are found
 //stop here and return the result
 break;
 }
 }
 else
 //Element is found in other repositories, just reset a flag
 isRedefined = EFalse;
 }
 }
-else if (err == KErrNotFound)
+else //err == KErrNotFound
 {
 //cNumFound is already set to zero during the initialization
 //Nothing to do here
-}
-else //any other errors
+//FindNumSettingsInCategory can only return KErrNotFound, let's
-{
+//assert we've only got KErrNotFound
-return err;
+__NK_ASSERT_DEBUG(err == KErrNotFound);
 }
 }
 //Low/High index in the CoreImg
 TInt32 vLoIndex = 0;
 if(err == KErrNone)
 {
 lowIndex = elementPos + 1;
 isRedefined = ETrue;
 }
-else if (err == KErrNotFound)
+else //err == KErrNotFound
 {
 //Element is not found, nothing to proceed here
+//FindSetting can only return KErrNotFound, let's assert
+//we've only got KErrNotFound
+__NK_ASSERT_DEBUG(err == KErrNotFound);
 }
-else
-{
-return err;
-}
 }
 if(cNumFound > 0 && !isRedefined)
 {
 //Check either this element is already redefined in the
 if(err == KErrNone)
 {
 lowIndex2 = elementPos2 + 1;
 isRedefined = ETrue;
 }
-else if (err == KErrNotFound)
+else //err == KErrNotFound
 {
 //Element is not found, nothing to proceed here
+//FindSetting can only return KErrNotFound, let's assert
+//we've only got KErrNotFound
+__NK_ASSERT_DEBUG(err == KErrNotFound);
 }
-else
-{
-return err;
-}
 }
 if(!isRedefined)
 {
 usrArrIndx = oNumFound + cNumFound + vNumFound;
 vNumFound ++;
 }
 else
 {
-//All required elements were found!
-//As vNumFound was used an index so it's value it runs
-//from 0 to X-1, where X - number of found elements. To
-//get number of elements found we need increase the last
-//counter value by 1.
-if(vNumFound != 0)
-vNumFound ++;
 //It reaches the goal, all required elements are found
 //stop here and return the result
 break;
 }
 }
 {
 isRedefined = EFalse;
 }
 }
 }
-else if (err == KErrNotFound)
+else //err == KErrNotFound
 {
 //oNumFound is already set to zero during the initialization
 //Nothing to do here
-}
-else
+//FindNumSettingsInCategory can only return KErrNotFound, let's
-{
+//assert we've only got KErrNotFound
-return err;
+__NK_ASSERT_DEBUG(err == KErrNotFound);
 }
 }
 //Let's prepare the final data
-numFound = oNumFound + cNumFound + vNumFound;
+return (oNumFound + cNumFound + vNumFound);
-//Return result to the user
-return numFound;
 }
 TInt numFound = 0;
 //Find the number of elements within the category
 r = FindNumSettingsInCategory(aCat);
-//Analyse the returned error
+//We don't expect any errors here
-//if r < 0 - this is an error return to the user
+__NK_ASSERT_DEBUG(r >= 0);
-//if r > 0 - number of found settings
-if(r < 0)
+if (r == 0)
-{
-HCR_TRACE_RETURN(r);
-}
-else if (r == 0)
 //No any elements found for this category
 return 0;
 else
 allInCatFound = r;
 //One of the allocation was unsuccessful
 HCR_TRACE_RETURN(KErrNoMemory);
 r = FindSettings(aCat, allInCatFound, pIds(), pTypes(), pLens());
-//Exit if we've got negative result just report error
+//We don't expect any errors here
-if(r < 0)
+__NK_ASSERT_DEBUG(r >= 0);
-HCR_TRACE_RETURN(r);
+//Check either we've got less elements than it must be
-//Somehow we'got less elements than it must be!!!
 __NK_ASSERT_DEBUG(r == allInCatFound);
-if(r < allInCatFound)
-HCR_TRACE_RETURN(KErrGeneral);
 //Choose the elements which satisfy this condition
 //((elementID & aElementMask) == (aPattern & aElementMask)). The total num-
 //ber of returned elements should not exceed the aMaxNum
 for(TInt index = 0; index < allInCatFound; index++)
 TBool HCR::TRepository::IsLargeValue(const TSettingRef& aRef)
 {
 HCR_FUNC("TRepository::IsLargeValue");
 return ((aRef.iSet->iType & KMaskLargeTypes) != 0);
-}
-void HCR::TRepository::GetId(const TSettingRef& aRef, TCategoryUid& aCat, TElementId& aKey)
-{
-HCR_FUNC("TRepository::GetId1");
-aCat = aRef.iSet->iId.iCat;
-aKey = aRef.iSet->iId.iKey;
 }
 void HCR::TRepository::GetId(const TSettingRef& aRef, SSettingId& aId)
 {
 HCR_FUNC("TRepository::GetId2");
 HCR_FUNC("TRepositoryCompiled::FindSetting within the given range");
 __NK_ASSERT_DEBUG(iRepos != 0);
 __NK_ASSERT_DEBUG(iRepos->iHdr != 0);
+	__NK_ASSERT_DEBUG(iRepos->iOrderedSettingList != 0);
-if ((iRepos->iHdr->iNumSettings == 0) ||
+	__NK_ASSERT_DEBUG(iRepos->iHdr->iNumSettings != 0);
-(iRepos->iOrderedSettingList == 0))
-HCR_TRACE_RETURN(KErrNotFound);
 SSettingC* arr = iRepos->iOrderedSettingList;
 TInt32 low = aLow;
 TInt32 high = aHigh;
 TInt32 mid;
 {
 HCR_FUNC("TRepositoryCompiled::GetWordSettings");
 __NK_ASSERT_DEBUG(iRepos != 0);
 __NK_ASSERT_DEBUG(iRepos->iHdr != 0);
+	__NK_ASSERT_DEBUG(aIds != NULL);
+	__NK_ASSERT_DEBUG(aValues != NULL);
+	__NK_ASSERT_DEBUG(aTypes != NULL);
+	__NK_ASSERT_DEBUG(aErrors != NULL);
 if ((iRepos->iHdr->iNumSettings == 0) ||
 (iRepos->iOrderedSettingList == 0))
 HCR_TRACE_RETURN(KErrNotFound);
 //Find first setting from user array. The importance here is that we
 //should get value of first setting index in the repository in rMinIndex.
 //This time the  scope of search is whole repository.
 err = this->FindSetting(*aIds[uIndex],settingRef, rMinIndex,
 0, iRepos->iHdr->iNumSettings);
+		__NK_ASSERT_DEBUG(err == KErrNotFound || err == KErrNone);
 if(err == KErrNotFound)
 {
 *aErrors[uIndex] = err;
 *aValues[uIndex] = 0;
-//Copy type only if user provided aTypes array
+*aTypes[uIndex] = ETypeUndefined;
-if(aTypes)
-*aTypes[uIndex] = ETypeUndefined;
 //As FindSetting did not find the element, let's challenge with
 //the next one from aIds[] array
 uIndex ++;
 continue;
 }
-//fatal error here, nothing to do, just exit and return the error code
-else if(err == KErrNotReady || err != KErrNone)
-{
-return err;
-}
 else // err == KErrNone
 {
 //Get the value and type
 pSetting = (SSettingC*) settingRef.iSet;
-//again copy the type value into the user array if it's provided
-if(aTypes)
-*aTypes[uIndex] = static_cast<TSettingType>(settingRef.iSet->iType);
-//Check for the found type is this word size? If it's not then
-//indicate error for this setting
-if(*aTypes[uIndex] > ETypeLinAddr)
-{
-*aErrors[uIndex] = KErrArgument;
-*aValues[uIndex] = 0;
-}
-else
-{
-*aErrors[uIndex] = KErrNone;
-*aValues[uIndex] = pSetting->iValue.iLit.iInt32;
-}
+			*aTypes[uIndex] = static_cast<TSettingType>(settingRef.iSet->iType);
+			//Check for the found type is this word size? If it's not then
+			//indicate error for this setting
+			if(*aTypes[uIndex] > ETypeLinAddr)
+				{
+				*aErrors[uIndex] = KErrArgument;
+				*aValues[uIndex] = 0;
+				}
+			else
+				{
+				*aErrors[uIndex] = KErrNone;
+				*aValues[uIndex] = pSetting->iValue.iLit.iInt32;
+				}
 //Break the loop by setting the redefined status
 isRedefined = ETrue;
 }
 }
 //Find the last setting from user array. The importance here is that we
 //should get value of first setting index in the repository in
 //rMinIndex. This time the  scope of search is whole repository.
 err = this->FindSetting(*aIds[uIndex],settingRef, rMaxIndex,
 rMinIndex, iRepos->iHdr->iNumSettings);
+		__NK_ASSERT_DEBUG(err == KErrNotFound || err == KErrNone);
 if(err == KErrNotFound)
 {
 *aErrors[uIndex] = err;
 *aValues[uIndex] = 0;
-if(aTypes)
+*aTypes[uIndex] = ETypeUndefined;
-*aTypes[uIndex] = ETypeUndefined;
 //As FindSetting did not find the element, let's challenge with
 //previous one, as we are moving in reverse direction
 uIndex --;
 continue;
 }
-//fatal error here, nothing to do, just exit and return the error code
-else if(err == KErrNotReady || err != KErrNone)
-{
-return err;
-}
 else //err == KErrNone
 {
 pSetting = (SSettingC*) settingRef.iSet;
-if(aTypes)
+*aTypes[uIndex] = static_cast<TSettingType>(settingRef.iSet->iType);
-*aTypes[uIndex] = static_cast<TSettingType>(settingRef.iSet->iType);
-//Check for the found type is this word size? If it's not then indicate
+			//Check for the found type is this word size? If it's not then indicate
-//error for this setting
+			//error for this setting
-if(*aTypes[uIndex] > ETypeLinAddr)
+			if(*aTypes[uIndex] > ETypeLinAddr)
-{
+				{
-*aErrors[uIndex] = KErrArgument;
+				*aErrors[uIndex] = KErrArgument;
-*aValues[uIndex] = 0;
+				*aValues[uIndex] = 0;
-}
+				}
-else
+			else
-{
+				{
-*aErrors[uIndex] = KErrNone;
+				*aErrors[uIndex] = KErrNone;
-*aValues[uIndex] = pSetting->iValue.iLit.iInt32;
+				*aValues[uIndex] = pSetting->iValue.iLit.iInt32;
-}
+				}
 isRedefined = ETrue;
 }
 }
 //At this point we found the last setting, store it's user array index in
 //search time.
 for(uIndex = uFirstIndex + 1; uIndex < uLastIndex; uIndex ++)
 {
 err = this->FindSetting(*aIds[uIndex],settingRef, rIndex,
 rMinIndex, rMaxIndex);
+		__NK_ASSERT_DEBUG(err == KErrNotFound || err == KErrNone);
 if(err == KErrNotFound)
 {
 *aErrors[uIndex] = err;
 *aValues[uIndex] = 0;
-if(aTypes)
+*aTypes[uIndex] = ETypeUndefined;
-*aTypes[uIndex] = ETypeUndefined;
 //As FindSetting did not find the element, let's challenge with
 //another one
 continue;
 }
-else if(err == KErrNotReady || err != KErrNone)
-{
-return err;
-}
 else //err == KErrNone
 {
 pSetting = (SSettingC*) settingRef.iSet;
-if(aTypes)
+*aTypes[uIndex] = static_cast<TSettingType>(settingRef.iSet->iType);
-*aTypes[uIndex] = static_cast<TSettingType>(settingRef.iSet->iType);
+			//Check for the found type is this word size? If it's not then indicate
-//Check for the found type is this word size? If it's not then indicate
+			//error for this setting
-//error for this setting
+			if(*aTypes[uIndex] > ETypeLinAddr)
-if(*aTypes[uIndex] > ETypeLinAddr)
+				{
-{
+				*aErrors[uIndex] = KErrArgument;
-*aErrors[uIndex] = KErrArgument;
+				*aValues[uIndex] = 0;
-*aValues[uIndex] = 0;
+				}
-}
+			else
-else
+				{
-{
+				*aErrors[uIndex] = KErrNone;
-*aErrors[uIndex] = KErrNone;
+				*aValues[uIndex] = pSetting->iValue.iLit.iInt32;
-*aValues[uIndex] = pSetting->iValue.iLit.iInt32;
+				}
-}
 rMinIndex = rIndex + 1;
 }
 }
 {
 HCR_FUNC("TRepositoryCompiled::FindNumSettingsInCategory");
 __NK_ASSERT_DEBUG(iRepos != 0);
 __NK_ASSERT_DEBUG(iRepos->iHdr != 0);
+	__NK_ASSERT_DEBUG(iRepos->iOrderedSettingList != 0);
-if ((iRepos->iHdr->iNumSettings == 0) || (iRepos->iOrderedSettingList == 0))
+if(iRepos->iHdr->iNumSettings == 0)
+{
+aFirst = 0;
+aLast = 0;
 HCR_TRACE_RETURN(KErrNotFound);
+}
 SSettingC* arr = iRepos->iOrderedSettingList;
 int low = 0;
 int high = iRepos->iHdr->iNumSettings-1;
 int mid = 0;
 return KErrNotFound;
 }
 //Search the first element within the category
 low = mid;
-while(low > 0 && arr[low].iName.iId.iCat == aCatUid)
+while(low >= 0 && arr[low].iName.iId.iCat == aCatUid)
 {
-low --;
+if(low > 0)
+low --;
+else
+break;
 }
 //Check the boundary conditions, there are two cases when we exit the loop
 //either we found an element which category is not one we are looking for or
 //we reach the beggining of the repository. If we reach the beggining of the
 //repository we don't really know is it because this is last elment or it
 //has required aCatUid, so we check these two conditions below
-if(low == 0 && arr[low].iName.iId.iCat == aCatUid)
+if(arr[low].iName.iId.iCat == aCatUid)
 aFirst = low;
 //We finish the loop either reaching the setting which category id is not
 //what we need or this is first setting in the repository again with another
 //category, so in both case we throw this element from the account.
 else
 aFirst = low + 1;
 //Search the last element within the category
 high = mid;
-while(high < iRepos->iHdr->iNumSettings && arr[high].iName.iId.iCat == aCatUid)
+while(high <= iRepos->iHdr->iNumSettings - 1 && arr[high].iName.iId.iCat == aCatUid)
 {
-high ++;
+if(high < iRepos->iHdr->iNumSettings - 1)
-}
+high ++;
+else
+break;
+}
 //Same situation as above, boundary conditions
-if(high == (iRepos->iHdr->iNumSettings -1) && arr[high].iName.iId.iCat == aCatUid)
+if(arr[high].iName.iId.iCat == aCatUid)
 aLast = high;
 else
 aLast = high -1;
 void HCR::TRepositoryCompiled::GetSettingRef(TInt32 aIndex,
 HCR::TSettingRef& aRef)
 {
 __NK_ASSERT_DEBUG(iRepos != 0);
 __NK_ASSERT_DEBUG(iRepos->iHdr != 0);
+__NK_ASSERT_DEBUG(iRepos->iHdr->iNumSettings != 0 && iRepos->iOrderedSettingList != 0);
 __NK_ASSERT_DEBUG(aIndex >=0 && aIndex < iRepos->iHdr->iNumSettings);
-if ((iRepos->iHdr->iNumSettings == 0) || (iRepos->iOrderedSettingList == 0))
-{
-aRef.iRep = NULL;
-aRef.iSet = NULL;
-}
 //Get the pointer to the repository data
 SSettingC* arr = iRepos->iOrderedSettingList;
 aRef.iRep = this;
 {
 HCR_FUNC("TRepositoryFile::FindSetting within the given range");
 __NK_ASSERT_DEBUG(iRepos != 0);
+__NK_ASSERT_DEBUG(iRepos->iHdr.iNumSettings != 0);
-if (iRepos->iHdr.iNumSettings == 0)
-HCR_TRACE_RETURN(KErrNotFound);
 SSettingF* arr = (SSettingF*) (iRepos+1);
 TInt32 low = aLow;
 TInt32 high = aHigh;
 TInt32 mid;
 {
 HCR_FUNC("TRepositoryFile::GetWordSettings");
 __NK_ASSERT_DEBUG(iRepos != 0);
+	__NK_ASSERT_DEBUG(aIds != NULL);
+	__NK_ASSERT_DEBUG(aValues != NULL);
+	__NK_ASSERT_DEBUG(aTypes != NULL);
+	__NK_ASSERT_DEBUG(aErrors != NULL);
 if (iRepos->iHdr.iNumSettings == 0)
 return KErrNotFound;
 TInt err = KErrNone;
 //Find first setting from user array. The importance here is that we
 //should get value of first setting index in the repository in rMinIndex.
 //This time the  scope of search is whole repository.
 err = this->FindSetting(*aIds[uIndex],settingRef, rMinIndex,
 0, iRepos->iHdr.iNumSettings);
+			__NK_ASSERT_DEBUG(err == KErrNotFound || err == KErrNone);
 if(err == KErrNotFound)
 {
 *aErrors[uIndex] = err;
 *aValues[uIndex] = 0;
-//Copy type only if user provided aTypes array
+*aTypes[uIndex] = ETypeUndefined;
-if(aTypes)
-*aTypes[uIndex] = ETypeUndefined;
 //As FindSetting did not find the element, let's challenge with
 //the next one from aIds[] array
 uIndex ++;
 continue;
 }
-//fatal error here, nothing to do, just exit and return the error code
-else if(err == KErrNotReady || err != KErrNone)
-{
-return err;
-}
 else // err == KErrNone
 {
 //Get the value and type
 pSetting = (SSettingF*) settingRef.iSet;
 //again copy the type value into the user array if it's provided
-if(aTypes)
+*aTypes[uIndex] = static_cast<TSettingType>(settingRef.iSet->iType);
-*aTypes[uIndex] = static_cast<TSettingType>(settingRef.iSet->iType);
-//Check for the found type is this word size? If it's not then
+				//Check for the found type is this word size? If it's not then
-//indicate error for this setting
+				//indicate error for this setting
-if(*aTypes[uIndex] > ETypeLinAddr)
+				if(*aTypes[uIndex] > ETypeLinAddr)
-{
+					{
-*aErrors[uIndex] = KErrArgument;
+					*aErrors[uIndex] = KErrArgument;
-*aValues[uIndex] = 0;
+					*aValues[uIndex] = 0;
-}
+					}
-else
+				else
-{
+					{
-*aErrors[uIndex] = KErrNone;
+					*aErrors[uIndex] = KErrNone;
-*aValues[uIndex] = pSetting->iValue.iLit.iInt32;
+					*aValues[uIndex] = pSetting->iValue.iLit.iInt32;
-}
+					}
 //Break the loop by setting the redefined status
 isRedefined = ETrue;
 }
 }
 //Find the last setting from user array. The importance here is that we
 //should get value of first setting index in the repository in
 //rMinIndex. This time the  scope of search is whole repository.
 err = this->FindSetting(*aIds[uIndex],settingRef, rMaxIndex,
 rMinIndex, iRepos->iHdr.iNumSettings);
+			__NK_ASSERT_DEBUG(err == KErrNotFound || err == KErrNone);
 if(err == KErrNotFound)
 {
 *aErrors[uIndex] = err;
 *aValues[uIndex] = 0;
-if(aTypes)
+*aTypes[uIndex] = ETypeUndefined;
-*aTypes[uIndex] = ETypeUndefined;
 //As FindSetting did not find the element, let's challenge with
 //previous one
 uIndex --;
 continue;
 }
-//fatal error here, nothing to do, just exit and return the error code
-else if(err == KErrNotReady || err != KErrNone)
-{
-return err;
-}
 else //err == KErrNone
 {
 pSetting = (SSettingF*) settingRef.iSet;
-if(aTypes)
+*aTypes[uIndex] = static_cast<TSettingType>(settingRef.iSet->iType);
-*aTypes[uIndex] = static_cast<TSettingType>(settingRef.iSet->iType);
+				//Check for the found type is this word size? If it's not then indicate
-//Check for the found type is this word size? If it's not then indicate
+				//error for this setting
-//error for this setting
+				if(*aTypes[uIndex] > ETypeLinAddr)
-if(*aTypes[uIndex] > ETypeLinAddr)
+					{
-{
+					*aErrors[uIndex] = KErrArgument;
-*aErrors[uIndex] = KErrArgument;
+					*aValues[uIndex] = 0;
-*aValues[uIndex] = 0;
+					}
-}
+				else
-else
+					{
-{
+					*aErrors[uIndex] = KErrNone;
-*aErrors[uIndex] = KErrNone;
+					*aValues[uIndex] = pSetting->iValue.iLit.iInt32;
-*aValues[uIndex] = pSetting->iValue.iLit.iInt32;
+					}
-}
 isRedefined = ETrue;
 }
 }
 //At this point we found the last setting, store it's user array index in
 //search time.
 for(uIndex = uFirstIndex + 1; uIndex < uLastIndex; uIndex ++)
 {
 err = this->FindSetting(*aIds[uIndex],settingRef, rIndex,
 rMinIndex, rMaxIndex);
+			__NK_ASSERT_DEBUG(err == KErrNotFound || err == KErrNone);
 if(err == KErrNotFound)
 {
 *aErrors[uIndex] = err;
 *aValues[uIndex] = 0;
-if(aTypes)
+*aTypes[uIndex] = ETypeUndefined;
-*aTypes[uIndex] = ETypeUndefined;
 //As FindSetting did not find the element, let's challenge with
 //another one
 continue;
 }
-else if(err == KErrNotReady || err != KErrNone)
-{
-return err;
-}
 else //err == KErrNone
 {
 pSetting = (SSettingF*) settingRef.iSet;
 TSettingType type = static_cast<TSettingType>(settingRef.iSet->iType);
-if(aTypes != NULL)
+*aTypes[uIndex] = type;
-*aTypes[uIndex] = type;
 //Check for the found type is this word size? If it's not then indicate
 //error for this setting
 if(type > ETypeLinAddr)
 {
 void HCR::TRepositoryFile::GetSettingRef(TInt32 aIndex,
 HCR::TSettingRef& aSetRef)
 {
 __NK_ASSERT_DEBUG(iRepos != 0);
+__NK_ASSERT_DEBUG(iRepos->iHdr.iNumSettings != 0);
 __NK_ASSERT_DEBUG(aIndex >= 0 && aIndex < iRepos->iHdr.iNumSettings);
-if (iRepos->iHdr.iNumSettings == 0)
-{
-aSetRef.iRep = NULL;
-aSetRef.iSet = NULL;
-}
 SSettingF* arr = (SSettingF*)(iRepos + 1);
 aSetRef.iRep = this;
 aSetRef.iSet = &(arr[aIndex].iName);
 TInt32& aFirst, TInt32& aLast)
 {
 HCR_FUNC("TRepositoryFile::FindNumSettingsInCategory");
 __NK_ASSERT_DEBUG(iRepos != 0);
-if (iRepos->iHdr.iNumSettings == 0)
+if(iRepos->iHdr.iNumSettings == 0)
+{
+aFirst = 0;
+aLast = 0;
 HCR_TRACE_RETURN(KErrNotFound);
+}
 SSettingF* arr = (SSettingF*) (iRepos+1);
 TInt32 low = 0;
 TInt32 high = iRepos->iHdr.iNumSettings-1;
 TInt32 mid = 0;
 TInt32 com = 0;
 return KErrNotFound;
 }
 //Search the first element within the category
 low = mid;
-while(low > 0 && arr[low].iName.iId.iCat == aCatUid)
+while(low >= 0 && arr[low].iName.iId.iCat == aCatUid)
 {
-low --;
+if(low > 0)
-}
+low --;
+else
+break;
+}
 //Check the boundary conditions, there are two cases when we exit the loop
 //either we found an element which category is not one we are looking for or
 //we reach the beggining of the repository. If we reach the beggining of the
 //repository we don't really know is it because this is last elment or it
 //has required aCatUid, so we check these two conditions below
-if(low == 0 && arr[low].iName.iId.iCat == aCatUid)
+if(arr[low].iName.iId.iCat == aCatUid)
 aFirst = low;
 //We finish the loop either reaching the setting which category id is not
 //what we need or this is first setting in the repository again with another
 //category, so in both case we throw this element from the account.
 else
 aFirst = low + 1;
 //Search the last element within the category
 high = mid;
-while(high < iRepos->iHdr.iNumSettings && arr[high].iName.iId.iCat == aCatUid)
+while(high <= iRepos->iHdr.iNumSettings - 1 && arr[high].iName.iId.iCat == aCatUid)
 {
-high ++;
+if(high < iRepos->iHdr.iNumSettings - 1)
-}
+high ++;
+else
+break;
+}
 //Same situation as above, boundary conditions
-if(high == (iRepos->iHdr.iNumSettings - 1) && arr[high].iName.iId.iCat == aCatUid)
+if(arr[high].iName.iId.iCat == aCatUid)
 aLast = high;
 else
-aLast = high -1;
+aLast = high - 1;
 return KErrNone;
 }

changeset 47	46fffbe7b5a7
parent 43	96e5fb8b040d