# HG changeset patch
# User hgs
# Date 1286964514 -10800
# Node ID 3592750162a523c7a10722cf3b3cc49ec17f4f80
# Parent  18fe5224f0dc509a05b1e845c5f39ae3c18acaa9
201039_1

diff -r 18fe5224f0dc -r 3592750162a5 usbclasses/usbmscpersonality/src/CUsbActiveMscHandlerMdrv.cpp
--- a/usbclasses/usbmscpersonality/src/CUsbActiveMscHandlerMdrv.cpp	Tue Sep 28 14:14:01 2010 +0300
+++ b/usbclasses/usbmscpersonality/src/CUsbActiveMscHandlerMdrv.cpp	Wed Oct 13 13:08:34 2010 +0300
@@ -957,7 +957,7 @@
         {
         FLOG(_L("Check drives for busy status"));
 	
-        TInt encDriverStatus;
+        TInt encDriverStatus(0);
 		
         if(!iDevEncSession)
             {
diff -r 18fe5224f0dc -r 3592750162a5 usbclasses/usbphoneasmodem/classimplementation/atplugin/inc/pamengine.h
--- a/usbclasses/usbphoneasmodem/classimplementation/atplugin/inc/pamengine.h	Tue Sep 28 14:14:01 2010 +0300
+++ b/usbclasses/usbphoneasmodem/classimplementation/atplugin/inc/pamengine.h	Wed Oct 13 13:08:34 2010 +0300
@@ -48,7 +48,7 @@
 	* @param aOwner
 	* @return Instance of CPamEngine
 	*/
-	static CPamEngine* CPamEngine::NewL( CPamPlugin* aOwner );
+	static CPamEngine* NewL( CPamPlugin* aOwner );
 						   
 	/**
 	* Two-phased contructor
diff -r 18fe5224f0dc -r 3592750162a5 usbclasses/usbphoneasmodem/classimplementation/atplugin/inc/pamplugindebug.h
--- a/usbclasses/usbphoneasmodem/classimplementation/atplugin/inc/pamplugindebug.h	Tue Sep 28 14:14:01 2010 +0300
+++ b/usbclasses/usbphoneasmodem/classimplementation/atplugin/inc/pamplugindebug.h	Wed Oct 13 13:08:34 2010 +0300
@@ -89,7 +89,7 @@
     User::Panic(aPanicCategory, aPanicCode); 
     }
 
-inline void TraceLeave(char* aFile, TInt aLine, TInt aReason)
+inline void TraceLeaveL(char* aFile, TInt aLine, TInt aReason)
     {
     TPtrC8 fullFileName((const TUint8*)aFile);
     TPtrC8 fileName(fullFileName.Ptr()+fullFileName.LocateReverse('\\')+1);
@@ -114,11 +114,11 @@
 
 #define PANIC(CODE) TracePanic(__FILE__, __LINE__, CODE, KPanicCategory)
 
-#define LEAVE_IF_ERROR(REASON) {if (REASON) TraceLeave(__FILE__, __LINE__, REASON);}
+#define LEAVE_IF_ERROR(REASON) {if (REASON) TraceLeaveL(__FILE__, __LINE__, REASON);}
 
-#define LEAVE_IF_NULL(PTR) {if (!PTR) TraceLeave(__FILE__, __LINE__, PTR);}
+#define LEAVE_IF_NULL(PTR) {if (!PTR) TraceLeaveL(__FILE__, __LINE__, PTR);}
 
-#define LEAVE(REASON) {TraceLeave(__FILE__, __LINE__, REASON);}
+#define LEAVE(REASON) {TraceLeaveL(__FILE__, __LINE__, REASON);}
 
 #define TRACE_STATIC_FUNC_ENTRY {if(KTraceMask & KPRINTINFO) { TPtrC8 ptr8((TUint8*)__PRETTY_FUNCTION__); Trace(KFuncEntryFormat8, &ptr8);}}
 
diff -r 18fe5224f0dc -r 3592750162a5 usbclasses/usbphoneasmodem/classimplementation/atplugin/inc/pamplugindebugconfig.h
--- a/usbclasses/usbphoneasmodem/classimplementation/atplugin/inc/pamplugindebugconfig.h	Tue Sep 28 14:14:01 2010 +0300
+++ b/usbclasses/usbphoneasmodem/classimplementation/atplugin/inc/pamplugindebugconfig.h	Wed Oct 13 13:08:34 2010 +0300
@@ -42,7 +42,8 @@
 _LIT8(KLeavePrefix8, "LEAVE code ");
 #endif
 
-const TInt KMaxLogLineLength = 512;
+const TInt KMaxLogLineLength = 508;  // 512-4, 4 is taken by TBuf structure, 
+// otherwise exceeds maximum single use of 1024 bytes for stack in TBuf16 config
 
 #define KPRINTERROR        0x00000001 // Tracing level: error
 #define KPRINTINFO        0x00000002 // Tracing level: function trace
diff -r 18fe5224f0dc -r 3592750162a5 usbclasses/usbphoneasmodem/classimplementation/atplugin/src/pamplugin.cpp
--- a/usbclasses/usbphoneasmodem/classimplementation/atplugin/src/pamplugin.cpp	Tue Sep 28 14:14:01 2010 +0300
+++ b/usbclasses/usbphoneasmodem/classimplementation/atplugin/src/pamplugin.cpp	Wed Oct 13 13:08:34 2010 +0300
@@ -83,7 +83,10 @@
     return ret;
     }
 
-
+// there is no trailing L, eventhough there are leaving functions inside
+// the problem comes from base class CATExtPluginBase, where defined HandleCommand(), 
+// without trailing L. This class belongs to /sf/os/bt/bt_plat/at_command_handler_plugin_api/inc/atextpluginbase.h, 
+// and has to be fixed there first.
 void CPamPlugin::HandleCommand( const TDesC8& aCmd, RBuf8& aReply, TBool aReplyNeeded )
 	{
 	TRACE_FUNC_ENTRY
diff -r 18fe5224f0dc -r 3592750162a5 usbclasses/usbphoneasmodem/classimplementation/inc/debug.h
--- a/usbclasses/usbphoneasmodem/classimplementation/inc/debug.h	Tue Sep 28 14:14:01 2010 +0300
+++ b/usbclasses/usbphoneasmodem/classimplementation/inc/debug.h	Wed Oct 13 13:08:34 2010 +0300
@@ -39,7 +39,8 @@
 
 #ifdef _DEBUG
 
-const TInt KMaxLogLineLength = 512;
+const TInt KMaxLogLineLength = 508;  // 512-4, 4 is taken by TBuf structure, 
+// otherwise exceeds maximum single use of 1024 bytes for stack in TBuf16 config
 
 // Trace options
 #define KPRINTERROR		0x00000001 // Print error
@@ -113,7 +114,7 @@
 	User::Panic(aPanicCategory, aPanicCode); 
     }
 
-inline void TraceLeave(char* aFile, TInt aLine, TInt aReason)
+inline void TraceLeaveL(char* aFile, TInt aLine, TInt aReason)
 	{
 	TPtrC8 fullFileName((const TUint8*)aFile);
 	TPtrC8 fileName(fullFileName.Ptr()+fullFileName.LocateReverse('\\')+1);
@@ -138,9 +139,9 @@
 
 #define PANIC(CODE) TracePanic(__FILE__, __LINE__, CODE, KPanicCategory)
 
-#define LEAVE_IF_ERROR(REASON) {if (REASON) TraceLeave(__FILE__, __LINE__, REASON);}
+#define LEAVE_IF_ERROR(REASON) {if (REASON) TraceLeaveL(__FILE__, __LINE__, REASON);}
 
-#define LEAVE(REASON) TraceLeave(__FILE__, __LINE__, REASON)
+#define LEAVE(REASON) TraceLeaveL(__FILE__, __LINE__, REASON)
 
 #define TRACE_FUNC_ENTRY {if(KTraceMask & KPRINTINFO) { TPtrC8 ptr8((TUint8*)__PRETTY_FUNCTION__); Trace(KFuncEntryFormat8, &ptr8);}}
 
diff -r 18fe5224f0dc -r 3592750162a5 usbengines/usbotgwatcher/inc/cusbnotifmanager.h
--- a/usbengines/usbotgwatcher/inc/cusbnotifmanager.h	Tue Sep 28 14:14:01 2010 +0300
+++ b/usbengines/usbotgwatcher/inc/cusbnotifmanager.h	Wed Oct 13 13:08:34 2010 +0300
@@ -110,8 +110,7 @@
  */
 class CUsbNotifManager : public CBase
     {
-    friend class CUsbNotifManager;
-
+    
 public:
 
     /**
diff -r 18fe5224f0dc -r 3592750162a5 usbengines/usbwatcher/src/tusbpersonalityparams.cpp
--- a/usbengines/usbwatcher/src/tusbpersonalityparams.cpp	Tue Sep 28 14:14:01 2010 +0300
+++ b/usbengines/usbwatcher/src/tusbpersonalityparams.cpp	Wed Oct 13 13:08:34 2010 +0300
@@ -28,7 +28,7 @@
 EXPORT_C TUsbPersonalityParams::TUsbPersonalityParams( RUsb& aUsbMan,
     CUsbPersonalityNotifier& aPersonalityNotifier )
     : iUsbMan( aUsbMan ),
-      iPersonalityNotifier( aPersonalityNotifier )
+      iPersonalityNotifier( aPersonalityNotifier ), iPersonalityId(0)
     {
     LOG_FUNC
 	
diff -r 18fe5224f0dc -r 3592750162a5 usbservices_plat/usb_personality_plugin_api/inc/cusbpersonalitynotifier.h
--- a/usbservices_plat/usb_personality_plugin_api/inc/cusbpersonalitynotifier.h	Tue Sep 28 14:14:01 2010 +0300
+++ b/usbservices_plat/usb_personality_plugin_api/inc/cusbpersonalitynotifier.h	Wed Oct 13 13:08:34 2010 +0300
@@ -69,7 +69,7 @@
     class TNotifierClient
         {
     public:
-        TNotifierClient::TNotifierClient(MUsbNotifierCallBack* aCallBack, TUid aNotifierUid, 
+        TNotifierClient(MUsbNotifierCallBack* aCallBack, TUid aNotifierUid, 
             const TDesC8 &aBuffer, TDes8 &aResponse, TRequestStatus* iRequestStatus, 
             TBool aConfirmation);