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

Stephan Bergmann sbergman at redhat.com
Tue Sep 8 06:37:55 PDT 2015


 connectivity/source/drivers/odbc/OResultSet.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bd53697bab53d46df952eeb23b609c59adc330cc
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 8 15:34:46 2015 +0200

    clang-analyzer-deadcode.DeadStores
    
    ...ever since OResultSet::fillNeededData got introduced in
    8687beec5dfc08b28accc7779e0f7762cd947f12 "INTEGRATION: CWS insight01" (and the
    return value of the N3SQLPutData call in the first case block had always been
    ignored completely, not even unnecessarily assigned to nRet as in these later
    two case blocks)
    
    Change-Id: I1d2005e7c91749510b23f86ac792bd11ae564608

diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index f813668..b6feb2f 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -1805,7 +1805,7 @@ void OResultSet::fillNeededData(SQLRETURN _nRet)
                 {
                     OUString sRet;
                     sRet = m_aRow[nColumnIndex].getString();
-                    nRet = N3SQLPutData (m_aStatementHandle, static_cast<SQLPOINTER>(const_cast<sal_Unicode *>(sRet.getStr())), sizeof(sal_Unicode)*sRet.getLength());
+                    N3SQLPutData (m_aStatementHandle, static_cast<SQLPOINTER>(const_cast<sal_Unicode *>(sRet.getStr())), sizeof(sal_Unicode)*sRet.getLength());
                     break;
                 }
                 case DataType::LONGVARCHAR:
@@ -1814,7 +1814,7 @@ void OResultSet::fillNeededData(SQLRETURN _nRet)
                     OUString sRet;
                     sRet = m_aRow[nColumnIndex].getString();
                     OString aString(OUStringToOString(sRet,m_nTextEncoding));
-                    nRet = N3SQLPutData (m_aStatementHandle, static_cast<SQLPOINTER>(const_cast<char *>(aString.getStr())), aString.getLength());
+                    N3SQLPutData (m_aStatementHandle, static_cast<SQLPOINTER>(const_cast<char *>(aString.getStr())), aString.getLength());
                     break;
                 }
                 default:


More information about the Libreoffice-commits mailing list