[mapguide-commits] r5188 - in trunk/MgDev/Common/Foundation: Data System

[svn_mapguide at osgeo.org]

Author: waltweltonlair
Date: 2010-09-24 05:10:37 +0000 (Fri, 24 Sep 2010)
New Revision: 5188

Modified:
   trunk/MgDev/Common/Foundation/Data/NamedCollection.cpp
   trunk/MgDev/Common/Foundation/System/StreamReader.cpp
   trunk/MgDev/Common/Foundation/System/XmlUtil.cpp
Log:
Minor cleanup...

Change code like the following:

    if (pointer)
        delete pointer;

to just:

    delete pointer;

Calling delete with null is safe.


Modified: trunk/MgDev/Common/Foundation/Data/NamedCollection.cpp
===================================================================
--- trunk/MgDev/Common/Foundation/Data/NamedCollection.cpp	2010-09-24 05:09:44 UTC (rev 5187)
+++ trunk/MgDev/Common/Foundation/Data/NamedCollection.cpp	2010-09-24 05:10:37 UTC (rev 5188)
@@ -59,11 +59,8 @@
 /// </summary>
 MgNamedCollection::~MgNamedCollection()
 {
-    if (m_pNameMap)
-    {
-        delete m_pNameMap;
-        m_pNameMap = NULL;
-    }
+    delete m_pNameMap;
+    m_pNameMap = NULL;
 }
 
 
@@ -263,11 +260,8 @@
 void MgNamedCollection::Clear()
 {
     // Clear the map
-    if (m_pNameMap)
-    {
-        delete m_pNameMap;
-        m_pNameMap = NULL;
-    }
+    delete m_pNameMap;
+    m_pNameMap = NULL;
 
     // Clear the list
     m_dCollection->Clear();

Modified: trunk/MgDev/Common/Foundation/System/StreamReader.cpp
===================================================================
--- trunk/MgDev/Common/Foundation/System/StreamReader.cpp	2010-09-24 05:09:44 UTC (rev 5187)
+++ trunk/MgDev/Common/Foundation/System/StreamReader.cpp	2010-09-24 05:10:37 UTC (rev 5188)
@@ -440,11 +440,7 @@
         {
             if (len > allocLen)
             {
-                if (NULL != temp)
-                {
-                    delete [] temp;
-                }
-
+                delete [] temp;
                 temp = new char[len];
                 allocLen = len;
             }
@@ -487,10 +483,7 @@
 
     MG_CATCH(L"MgStreamReader.GetStream")
 
-    if (NULL != temp)
-    {
-        delete [] temp;
-    }
+    delete [] temp;
 
     MG_THROW()
 

Modified: trunk/MgDev/Common/Foundation/System/XmlUtil.cpp
===================================================================
--- trunk/MgDev/Common/Foundation/System/XmlUtil.cpp	2010-09-24 05:09:44 UTC (rev 5187)
+++ trunk/MgDev/Common/Foundation/System/XmlUtil.cpp	2010-09-24 05:10:37 UTC (rev 5188)
@@ -87,24 +87,16 @@
 
 MgXmlUtil::~MgXmlUtil()
 {
-    if (NULL != m_parser)
-    {
-        delete m_parser;
-        m_parser = NULL;
-    }
+    delete m_parser;
+    m_parser = NULL;
 
-    if (NULL != m_bis)
-    {
-        delete m_bis;
-        m_bis = NULL;
-    }
+    delete m_bis;
+    m_bis = NULL;
 
     if (NULL != m_doc)
     {
         if (m_ownDomDoc)
-        {
             m_doc->release();
-        }
 
         m_doc = NULL;
     }