[Libreoffice-commits] core.git: connectivity/source

[Andrzej J.R. Hunt]

 connectivity/source/drivers/firebird/FResultSetMetaData.cxx |    1 +
 connectivity/source/drivers/firebird/FServices.cxx          |   12 +++++++-----
 connectivity/source/drivers/firebird/FStatement.cxx         |    2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 30905e486b4c0b40b893a4c0a31e7e6daee28ffc
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date:   Wed Jul 17 07:35:53 2013 +0200

    Fix clang warnings in firebird-sdbc.
    
    Change-Id: I89c0f22e8db166537f1d6b9313f94c9c3631f195

diff --git a/connectivity/source/drivers/firebird/FResultSetMetaData.cxx b/connectivity/source/drivers/firebird/FResultSetMetaData.cxx
index f756bc0..d8f0539 100644
--- a/connectivity/source/drivers/firebird/FResultSetMetaData.cxx
+++ b/connectivity/source/drivers/firebird/FResultSetMetaData.cxx
@@ -44,6 +44,7 @@ using namespace com::sun::star::sdbc;
 // -------------------------------------------------------------------------
 OResultSetMetaData::~OResultSetMetaData()
 {
+    (void) m_pConnection; // To remove warning until the rest of the class is implemented..
 }
 // -------------------------------------------------------------------------
 // -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/firebird/FServices.cxx b/connectivity/source/drivers/firebird/FServices.cxx
index 9bda80f..381b6ea 100644
--- a/connectivity/source/drivers/firebird/FServices.cxx
+++ b/connectivity/source/drivers/firebird/FServices.cxx
@@ -104,12 +104,14 @@ struct ProviderRequest
             )
     {
         if (!xRet.is() && (Implname == sImplementationName))
-        try
-        {
-            xRet = creator( xServiceManager, sImplementationName,Factory, Services,0);
-        }
-        catch(...)
         {
+            try
+            {
+                xRet = creator( xServiceManager, sImplementationName,Factory, Services,0);
+            }
+            catch(...)
+            {
+            }
         }
         return xRet.is();
     }
diff --git a/connectivity/source/drivers/firebird/FStatement.cxx b/connectivity/source/drivers/firebird/FStatement.cxx
index 7823380..2646330 100644
--- a/connectivity/source/drivers/firebird/FStatement.cxx
+++ b/connectivity/source/drivers/firebird/FStatement.cxx
@@ -71,7 +71,7 @@ static int pr_error (const ISC_STATUS* status, const char* operation)
 
     isc_print_status(status);
 
-    printf("SQLCODE:%d\n", isc_sqlcode(status));
+//    printf("SQLCODE:%d\n", isc_sqlcode(status)); Causes warning on some platforms
 
     printf("]\n");