[mapguide-commits] r1278 - trunk/MgDev/Common/CoordinateSystem

[svn_mapguide at osgeo.org]

Author: stevedang
Date: 2007-03-18 01:50:44 -0400 (Sun, 18 Mar 2007)
New Revision: 1278

Modified:
   trunk/MgDev/Common/CoordinateSystem/CoordSys.cpp
Log:
Some Coordinate System code cleanups.

Modified: trunk/MgDev/Common/CoordinateSystem/CoordSys.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSys.cpp	2007-03-18 04:40:48 UTC (rev 1277)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSys.cpp	2007-03-18 05:50:44 UTC (rev 1278)
@@ -422,10 +422,10 @@
                             {
                                 STRING message = L"Could not parse the OGC WKT.";
 
-                                const char* error = CPLGetLastErrorMsg();
-                                if(error)
+                                const char* errMsg = CPLGetLastErrorMsg();
+                                if(errMsg)
                                 {
-                                    wchar_t* strError = Convert_Ascii_To_Wide(error);
+                                    wchar_t* strError = Convert_Ascii_To_Wide(errMsg);
                                     message += L" ";
                                     message += strError;
 
@@ -488,10 +488,10 @@
                     {
                         STRING message = L"Could not convert OGC WKT to PROJ4.";
 
-                        const char* error = CPLGetLastErrorMsg();
-                        if(error)
+                        const char* errMsg = CPLGetLastErrorMsg();
+                        if(errMsg)
                         {
-                            wchar_t* strError = Convert_Ascii_To_Wide(error);
+                            wchar_t* strError = Convert_Ascii_To_Wide(errMsg);
                             message += L" ";
                             message += strError;
 
@@ -593,10 +593,10 @@
             {
                 STRING message = L"Could not parse the OGC WKT.";
 
-                const char* error = CPLGetLastErrorMsg();
-                if(error)
+                const char* errMsg = CPLGetLastErrorMsg();
+                if(errMsg)
                 {
-                    wchar_t* strError = Convert_Ascii_To_Wide(error);
+                    wchar_t* strError = Convert_Ascii_To_Wide(errMsg);
                     message += L" ";
                     message += strError;
 
@@ -1517,10 +1517,10 @@
     {
         STRING message = L"Could not determine code because of internal OGR error.";
 
-        const char* error = CPLGetLastErrorMsg();
-        if(error)
+        const char* errMsg = CPLGetLastErrorMsg();
+        if(errMsg)
         {
-            wchar_t* strError = Convert_Ascii_To_Wide(error);
+            wchar_t* strError = Convert_Ascii_To_Wide(errMsg);
             message += L" ";
             message += strError;
 
@@ -1589,7 +1589,7 @@
             {
                 STRING unitsValueString;
 
-                char buffer[255];
+                char buffer[255] = { 0 };
                 sprintf(buffer, "%.10g", unitsValue);
 
                 wBuffer = Convert_Ascii_To_Wide(buffer);
@@ -1719,10 +1719,10 @@
     {
         STRING message = L"Unsupported coordinate system code.";
 
-        const char* error = CPLGetLastErrorMsg();
-        if(error)
+        const char* errMsg = CPLGetLastErrorMsg();
+        if(errMsg)
         {
-            wchar_t* strError = Convert_Ascii_To_Wide(error);
+            wchar_t* strError = Convert_Ascii_To_Wide(errMsg);
             message += L" ";
             message += strError;
 
@@ -2118,9 +2118,9 @@
 
     if(OGRERR_NONE != error)
     {
-        const char* error = CPLGetLastErrorMsg();
+        const char* errMsg = CPLGetLastErrorMsg();
 
-        char buffer[255];
+        char buffer[255] = { 0 };
         #ifdef WIN32
         itoa(code, buffer, 10);
         #else
@@ -2136,9 +2136,9 @@
         delete [] strCode;
         strCode = NULL;
 
-        if(error)
+        if(errMsg)
         {
-            wchar_t* strError = Convert_Ascii_To_Wide(error);
+            wchar_t* strError = Convert_Ascii_To_Wide(errMsg);
             message += L" ";
             message += strError;
 
@@ -2218,9 +2218,9 @@
 
     if(OGRERR_NONE != error)
     {
-        const char* error = CPLGetLastErrorMsg();
+        const char* errMsg = CPLGetLastErrorMsg();
 
-        char buffer[255];
+        char buffer[255] = { 0 };
         #ifdef WIN32
         itoa(code, buffer, 10);
         #else
@@ -2233,9 +2233,9 @@
         delete [] strCode;
         strCode = NULL;
 
-        if(error)
+        if(errMsg)
         {
-            wchar_t* strError = Convert_Ascii_To_Wide(error);
+            wchar_t* strError = Convert_Ascii_To_Wide(errMsg);
             message += L" ";
             message += strError;