--- a/btobexprofiles/obexserviceman/obexservicemanserver/src/SrcsServiceManager.cpp Fri Jun 11 13:48:51 2010 +0300
+++ b/btobexprofiles/obexserviceman/obexservicemanserver/src/SrcsServiceManager.cpp Wed Jun 23 18:23:52 2010 +0300
@@ -228,17 +228,17 @@
case ESrcsTransportBT:
FLOG(_L("[SRCS]\tserver\tCSrcsServiceManager: ManageServicesL(Bluetooth)"));
iTransportName.Set(KSrcsTransportBT);
- ServiceArray(*iBTConnectionArray, aState);
+ ServiceArrayL(*iBTConnectionArray, aState);
break;
case ESrcsTransportUSB:
FLOG(_L("[SRCS]\tserver\tCSrcsServiceManager: ManageServicesL(USB)"));
iTransportName.Set(KSrcsTransportUSB);
- ServiceArray(*iUSBConnectionArray, aState);
+ ServiceArrayL(*iUSBConnectionArray, aState);
break;
case ESrcsTransportIrDA:
FLOG(_L("[SRCS]\tserver\tCSrcsServiceManager: ManageServicesL(IrDA)"));
iTransportName.Set(KSrcsTransportIrDA);
- ServiceArray(*iIrDAConnectionArray, aState);
+ ServiceArrayL(*iIrDAConnectionArray, aState);
break;
default:
FTRACE(FPrint(_L("[SRCS]\tserver\tCSrcsServiceManager: ManageServicesL. Transport not supported.")));
@@ -252,9 +252,9 @@
// Method to manage Service arrays
// ---------------------------------------------------------
//
-void CSrcsServiceManager::ServiceArray(CArrayPtr<CSrcsTransport> &aTransport, TBool aState)
+void CSrcsServiceManager::ServiceArrayL(CArrayPtr<CSrcsTransport> &aTransport, TBool aState)
{
- FLOG(_L("[SRCS]\tserver\tCSrcsServiceManager: ServiceArray"));
+ FLOG(_L("[SRCS]\tserver\tCSrcsServiceManager: ServiceArrayL"));
// We start and stop services by aState value
if ( aState ) // trun on service
@@ -320,7 +320,7 @@
FTRACE(FPrint(_L("[SRCS]\tserver\tCSrcsServiceManager: ManageServicesL. Transport implementation not found.")));
}
- // Clean up
+ // Clean up. todo (from reviewing): memory leak when some func above leaves. To be fixed
infoArrayTranport.ResetAndDestroy();
infoArrayServiceController.ResetAndDestroy();
CleanupStack::PopAndDestroy(2); //infoArrayServiceController