--- a/bluetooth/btsdp/database/rsdpdatabase.cpp	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btsdp/database/rsdpdatabase.cpp	Wed Oct 13 16:20:29 2010 +0300
@@ -149,7 +149,13 @@
 This should be used by clients to do resource leakage debugging checks. */
 	{
 	LOG_FUNC
-	SendReceive(ESdpResourceCountMarkStart, TIpcArgs(NULL)); //ss//
+	IF_FLOGGING(TInt err = ) SendReceive(ESdpResourceCountMarkStart, TIpcArgs(NULL)); //ss//
+	IF_FLOGGING(
+		if (err != KErrNone)
+			{
+			LOG1(_L("ALERT: Resource count mark start completed with %d"), err);
+			}
+		);
 	}
 
 EXPORT_C void RSdp::ResourceCountMarkEnd()
@@ -158,7 +164,13 @@
 This should be used by clients to do resource leakage debugging checks. */
 	{
 	LOG_FUNC
-	SendReceive(ESdpResourceCountMarkEnd, TIpcArgs(NULL)); //ss//
+	IF_FLOGGING(TInt err = ) SendReceive(ESdpResourceCountMarkEnd, TIpcArgs(NULL)); //ss//
+	IF_FLOGGING(
+		if (err != KErrNone)
+			{
+			LOG1(_L("ALERT: Resource count mark end completed with %d"), err);
+			}
+		);
 	}
 
 EXPORT_C TInt RSdp::ResourceCount()
@@ -171,7 +183,13 @@
 	LOG_FUNC
 	TInt count = 0;
 	TPckgBuf<TInt> pckg(count);
-	SendReceive(ESdpResourceCount, TIpcArgs(&pckg)); //ss//
+	IF_FLOGGING(TInt err = ) SendReceive(ESdpResourceCount, TIpcArgs(&pckg)); //ss//
+	IF_FLOGGING(
+		if (err != KErrNone)
+			{
+			LOG1(_L("ALERT: Resource count completed with %d"), err);
+			}
+		);
 	return pckg();
 	}
 
@@ -449,7 +467,8 @@
 	if (SubSessionHandle())
 		{
 		 //The '5' below is max ratio of number of UTF_8 chars to number of unicode chars .
-		HBufC8* buf = HBufC8::NewLC(5*aDesCValue.Length());
+		TInt size = 5*aDesCValue.Length(); 
+		HBufC8* buf = HBufC8::NewLC(size);
 		TPtr8 ptr = buf->Des();
 		CnvUtfConverter::ConvertFromUnicodeToUtf8(ptr, aDesCValue);
 		UpdateAttributeL(aHandle, aAttrID, ptr);
@@ -545,7 +564,13 @@
 		TPckg<TSdpAttributeID> idPckg(aAttrID);
 		TPckg<TSdpServRecordHandle> handlePckg(aHandle);
 
-		SendReceive(ESdpDatabaseDeleteAttribute, TIpcArgs(&handlePckg, &idPckg));
+		IF_FLOGGING(TInt err = ) SendReceive(ESdpDatabaseDeleteAttribute, TIpcArgs(&handlePckg, &idPckg));
+		IF_FLOGGING(
+			if (err != KErrNone)
+				{
+				LOG1(_L("ALERT: Delete attribute completed with %d"), err);
+				}
+			);
 		}
 	else
 		{
@@ -589,7 +614,13 @@
 		{
 		TPckg<TSdpServRecordHandle> handlePckg(aHandle);
 
-		SendReceive(ESdpDatabaseDeleteServiceRecord, TIpcArgs(&handlePckg));
+		IF_FLOGGING(TInt err = ) SendReceive(ESdpDatabaseDeleteServiceRecord, TIpcArgs(&handlePckg));
+		IF_FLOGGING(
+			if (err != KErrNone)
+				{
+				LOG1(_L("ALERT: Delete service record completed with %d"), err);
+				}
+			);
 		}
 	else
 		{