Author: Clint Byrum <clint@ubuntu.com>
Description: Address errors reported while building with -Werror=format-security
Bug-Ubuntu: http://pad.lv/881064
Forwarded: yes
Bug: http://trac.osgeo.org/gdal/ticket/4307

Index: gdal/frmts/dods/dodsdataset2.cpp
===================================================================
--- gdal.orig/frmts/dods/dodsdataset2.cpp	2011-10-24 11:42:17.077365503 -0700
+++ gdal/frmts/dods/dodsdataset2.cpp	2011-10-24 11:42:36.876196542 -0700
@@ -1075,7 +1075,7 @@
         string msg =
 "An error occurred while creating a virtual connection to the DAP server:\n";
         msg += e.get_error_message();
-        CPLError(CE_Failure, CPLE_AppDefined, msg.c_str());
+        CPLError(CE_Failure, CPLE_AppDefined, "%s", msg.c_str());
         delete poDS;
         poDS = NULL;
     }
@@ -1640,7 +1640,7 @@
 /*      Catch exceptions                                                */
 /* -------------------------------------------------------------------- */
     catch (Error &e) {
-        CPLError(CE_Failure, CPLE_AppDefined, e.get_error_message().c_str());
+        CPLError(CE_Failure, CPLE_AppDefined, "%s", e.get_error_message().c_str());
         return CE_Failure;
     }
     
Index: gdal/ogr/ogrsf_frmts/dods/ogrdodsdatasource.cpp
===================================================================
--- gdal.orig/ogr/ogrsf_frmts/dods/ogrdodsdatasource.cpp	2011-10-24 11:43:03.546623920 -0700
+++ gdal/ogr/ogrsf_frmts/dods/ogrdodsdatasource.cpp	2011-10-24 11:43:21.157588269 -0700
@@ -155,7 +155,7 @@
     } 
     catch (Error &e) 
     {
-        CPLError(CE_Failure, CPLE_OpenFailed, 
+        CPLError(CE_Failure, CPLE_OpenFailed, "%s",
                  e.get_error_message().c_str() );
         return FALSE;
     }
