--- a/networkingtestandutils/ipprobe/src/family.cpp Tue Aug 31 16:45:15 2010 +0300
+++ b/networkingtestandutils/ipprobe/src/family.cpp Wed Sep 01 12:33:58 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2009 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"
@@ -20,10 +20,6 @@
//
// Nothing interesting here...
//
-GLDEF_C TInt E32Dll()
- {
- return KErrNone;
- }
class CProtocolFamilyProbe : public CProtocolFamilyBase
{
@@ -36,12 +32,10 @@
CProtocolBase* NewProtocolL(TUint /*aSockType*/, TUint aProtocol);
};
-extern "C" { IMPORT_C CProtocolFamilyBase* Install(); }
+extern "C" { IMPORT_C CProtocolFamilyBase* Install(void); }
EXPORT_C CProtocolFamilyBase* Install()
{
- // Due to naming convention this cannot leave
- // However null return value handled correctly in the caller...
- return new CProtocolFamilyProbe;
+ return new (ELeave) CProtocolFamilyProbe;
}
//----------------------------------------------------------------------
@@ -69,9 +63,7 @@
TUint CProtocolFamilyProbe::ProtocolList(TServerProtocolDesc *& aList)
{
- // This function might leave, but it has been taken care of in the calling function
- const TInt index =2;
- aList = new TServerProtocolDesc[index];
+ aList = new TServerProtocolDesc[2];
if (aList == NULL)
return 0;