Tag: cws_src680_warnings01 User: fs Date: 05/11/21 07:51:44 Modified: /dba/connectivity/source/drivers/dbase/ DIndex.cxx /dba/connectivity/source/drivers/evoab/ LConnection.cxx, LDatabaseMetaData.cxx /dba/connectivity/source/drivers/file/ FTable.cxx, fcomp.cxx /dba/connectivity/source/drivers/hsqldb/ HDriver.cxx /dba/connectivity/source/drivers/jdbc/ JDriver.cxx /dba/connectivity/source/drivers/odbc/ OResultSet.cxx /dba/connectivity/source/inc/ diagnose_ex.h
Log: #i57457# OSL_VERIFY_EQUALS File Changes: Directory: /dba/connectivity/source/drivers/dbase/ ================================================== File [changed]: DIndex.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/dbase/DIndex.cxx?r1=1.38.30.1&r2=1.38.30.2 Delta lines: +3 -3 ------------------- --- DIndex.cxx 7 Nov 2005 14:43:13 -0000 1.38.30.1 +++ DIndex.cxx 21 Nov 2005 15:51:36 -0000 1.38.30.2 @@ -4,9 +4,9 @@ * * $RCSfile: DIndex.cxx,v $ * - * $Revision: 1.38.30.1 $ + * $Revision: 1.38.30.2 $ * - * last change: $Author: fs $ $Date: 2005/11/07 14:43:13 $ + * last change: $Author: fs $ $Date: 2005/11/21 15:51:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -431,7 +431,7 @@ // aText.Convert(m_pTable->getConnection()->getTextEncoding(), rIndex.m_pTable->getConnection()->GetCharacterSet()); strcpy(rIndex.m_aHeader.db_name,aText.GetBuffer()); */ - OSL_VERIFY_RES( 512 == rStream.Write(&rIndex.m_aHeader,512), "Write not successful: Wrong header size for dbase index!"); + OSL_VERIFY_EQUALS( rStream.Write(&rIndex.m_aHeader,512), 512, "Write not successful: Wrong header size for dbase index!"); return rStream; } // ------------------------------------------------------------------------- Directory: /dba/connectivity/source/drivers/evoab/ ================================================== File [changed]: LConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/evoab/LConnection.cxx?r1=1.7.30.2&r2=1.7.30.3 Delta lines: +5 -4 ------------------- --- LConnection.cxx 16 Nov 2005 12:58:56 -0000 1.7.30.2 +++ LConnection.cxx 21 Nov 2005 15:51:36 -0000 1.7.30.3 @@ -4,9 +4,9 @@ * * $RCSfile: LConnection.cxx,v $ * - * $Revision: 1.7.30.2 $ + * $Revision: 1.7.30.3 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:58:56 $ + * last change: $Author: fs $ $Date: 2005/11/21 15:51:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -165,8 +165,9 @@ EVO_TRACE_STRING("OEvoabConnection::construct()::aArg1 = %s\n", aArg1 ); EVO_TRACE_STRING("OEvoabConnection::construct()::aArg2 = %s\n", aArg2 ); OProcess aApp( aCLICommand,aWorkingDirPath); - OSL_VERIFY_RES( - OProcess::E_None == aApp.execute( (OProcess::TProcessOption)(OProcess::TOption_Hidden | OProcess::TOption_Wait | OProcess::TOption_SearchPath),aArgs), + OSL_VERIFY_EQUALS( + aApp.execute( (OProcess::TProcessOption)(OProcess::TOption_Hidden | OProcess::TOption_Wait | OProcess::TOption_SearchPath),aArgs), + OProcess::E_None, "Error at execute evolution-addressbook-export to get VCards"); File [changed]: LDatabaseMetaData.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx?r1=1.4.30.2&r2=1.4.30.3 Delta lines: +5 -4 ------------------- --- LDatabaseMetaData.cxx 16 Nov 2005 12:58:57 -0000 1.4.30.2 +++ LDatabaseMetaData.cxx 21 Nov 2005 15:51:37 -0000 1.4.30.3 @@ -4,9 +4,9 @@ * * $RCSfile: LDatabaseMetaData.cxx,v $ * - * $Revision: 1.4.30.2 $ + * $Revision: 1.4.30.3 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:58:57 $ + * last change: $Author: fs $ $Date: 2005/11/21 15:51:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -517,8 +517,9 @@ EVO_TRACE_STRING( "OEvoabDatabaseMetaData::getTables()::aArg3 = %s\n", aArg3 ); OProcess aApp( aCLICommand,aWorkingDir); - OSL_VERIFY_RES( - OProcess::E_None == aApp.execute( (OProcess::TProcessOption)(OProcess::TOption_Hidden | OProcess::TOption_Wait | OProcess::TOption_SearchPath),aArgs), + OSL_VERIFY_EQUALS( + aApp.execute( (OProcess::TProcessOption)(OProcess::TOption_Hidden | OProcess::TOption_Wait | OProcess::TOption_SearchPath),aArgs), + OProcess::E_None, "Error at execute evolution-addressbook-exporter to get VCards" ); bMoreData = pFolderList->next(); Directory: /dba/connectivity/source/drivers/file/ ================================================= File [changed]: FTable.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FTable.cxx?r1=1.21.30.2&r2=1.21.30.3 Delta lines: +3 -3 ------------------- --- FTable.cxx 16 Nov 2005 12:59:02 -0000 1.21.30.2 +++ FTable.cxx 21 Nov 2005 15:51:38 -0000 1.21.30.3 @@ -4,9 +4,9 @@ * * $RCSfile: FTable.cxx,v $ * - * $Revision: 1.21.30.2 $ + * $Revision: 1.21.30.3 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:59:02 $ + * last change: $Author: fs $ $Date: 2005/11/21 15:51:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -71,7 +71,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; -DBG_NAME( file_OFileTable ); +DBG_NAME( file_OFileTable ) OFileTable::OFileTable(sdbcx::OCollection* _pTables,OConnection* _pConnection) : OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers()) ,m_pConnection(_pConnection) File [changed]: fcomp.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/fcomp.cxx?r1=1.23.28.1&r2=1.23.28.2 Delta lines: +3 -3 ------------------- --- fcomp.cxx 7 Nov 2005 14:43:35 -0000 1.23.28.1 +++ fcomp.cxx 21 Nov 2005 15:51:38 -0000 1.23.28.2 @@ -4,9 +4,9 @@ * * $RCSfile: fcomp.cxx,v $ * - * $Revision: 1.23.28.1 $ + * $Revision: 1.23.28.2 $ * - * last change: $Author: fs $ $Date: 2005/11/07 14:43:35 $ + * last change: $Author: fs $ $Date: 2005/11/21 15:51:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -87,7 +87,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::util; -DBG_NAME(OPredicateCompiler); +DBG_NAME(OPredicateCompiler) //------------------------------------------------------------------ OPredicateCompiler::OPredicateCompiler(OSQLAnalyzer* pAnalyzer)//,OCursor& rCurs) // : m_rCursor(rCurs) Directory: /dba/connectivity/source/drivers/hsqldb/ =================================================== File [changed]: HDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/HDriver.cxx?r1=1.14.8.3&r2=1.14.8.4 Delta lines: +3 -3 ------------------- --- HDriver.cxx 16 Nov 2005 12:59:05 -0000 1.14.8.3 +++ HDriver.cxx 21 Nov 2005 15:51:39 -0000 1.14.8.4 @@ -4,9 +4,9 @@ * * $RCSfile: HDriver.cxx,v $ * - * $Revision: 1.14.8.3 $ + * $Revision: 1.14.8.4 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:59:05 $ + * last change: $Author: fs $ $Date: 2005/11/21 15:51:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -335,7 +335,7 @@ sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const ::rtl::OUString& url ) throw (SQLException, RuntimeException) { sal_Bool bEnabled = sal_False; - OSL_VERIFY_RES( jfw_getEnabled( &bEnabled ) == JFW_E_NONE, "error in jfw_getEnabled" ); + OSL_VERIFY_EQUALS( jfw_getEnabled( &bEnabled ), JFW_E_NONE, "error in jfw_getEnabled" ); return bEnabled && url.compareToAscii("sdbc:embedded:hsqldb",sizeof("sdbc:embedded:hsqldb")) == 0; } Directory: /dba/connectivity/source/drivers/jdbc/ ================================================= File [changed]: JDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/JDriver.cxx?r1=1.34.30.2&r2=1.34.30.3 Delta lines: +3 -3 ------------------- --- JDriver.cxx 16 Nov 2005 12:59:10 -0000 1.34.30.2 +++ JDriver.cxx 21 Nov 2005 15:51:40 -0000 1.34.30.3 @@ -4,9 +4,9 @@ * * $RCSfile: JDriver.cxx,v $ * - * $Revision: 1.34.30.2 $ + * $Revision: 1.34.30.3 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:59:10 $ + * last change: $Author: fs $ $Date: 2005/11/21 15:51:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -143,7 +143,7 @@ // don't ask the real driver for the url // I feel responsible for all jdbc url's sal_Bool bEnabled = sal_False; - OSL_VERIFY_RES( JFW_E_NONE == jfw_getEnabled( &bEnabled ),"error in jfw_getEnabled" ); + OSL_VERIFY_EQUALS( jfw_getEnabled( &bEnabled ), JFW_E_NONE, "error in jfw_getEnabled" ); static const ::rtl::OUString s_sJdbcPrefix = ::rtl::OUString::createFromAscii("jdbc:"); return bEnabled && 0 == url.compareTo(s_sJdbcPrefix, 5); } Directory: /dba/connectivity/source/drivers/odbc/ ================================================= File [changed]: OResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/odbc/OResultSet.cxx?r1=1.59.10.4&r2=1.59.10.5 Delta lines: +3 -3 ------------------- --- OResultSet.cxx 21 Nov 2005 10:07:56 -0000 1.59.10.4 +++ OResultSet.cxx 21 Nov 2005 15:51:40 -0000 1.59.10.5 @@ -4,9 +4,9 @@ * * $RCSfile: OResultSet.cxx,v $ * - * $Revision: 1.59.10.4 $ + * $Revision: 1.59.10.5 $ * - * last change: $Author: fs $ $Date: 2005/11/21 10:07:56 $ + * last change: $Author: fs $ $Date: 2005/11/21 15:51:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -978,7 +978,7 @@ m_nLastColumnPos = 0; // first unbound all columns - OSL_VERIFY_RES( SQL_SUCCESS == N3SQLFreeStmt(m_aStatementHandle,SQL_UNBIND),"Could not unbind columns!"); + OSL_VERIFY_EQUALS( N3SQLFreeStmt(m_aStatementHandle,SQL_UNBIND), SQL_SUCCESS, "Could not unbind columns!" ); // SQLRETURN nRet = N3SQLSetStmtAttr(m_aStatementHandle,SQL_ATTR_ROW_ARRAY_SIZE ,(SQLPOINTER)1,SQL_IS_INTEGER); m_bInserting = sal_True; } Directory: /dba/connectivity/source/inc/ ======================================== File [changed]: diagnose_ex.h Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/diagnose_ex.h?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +9 -5 ------------------- --- diagnose_ex.h 7 Nov 2005 14:49:17 -0000 1.1.2.1 +++ diagnose_ex.h 21 Nov 2005 15:51:41 -0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: diagnose_ex.h,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: fs $ $Date: 2005/11/07 14:49:17 $ + * last change: $Author: fs $ $Date: 2005/11/21 15:51:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -39,12 +39,16 @@ #if OSL_DEBUG_LEVEL > 0 #define OSL_VERIFY_RES( expression, fail_message ) \ OSL_ENSURE( expression, fail_message ) + #define OSL_VERIFY_EQUALS( expression, compare, fail_message ) \ + OSL_ENSURE( expression == compare, fail_message ) #else #define OSL_VERIFY_RES( expression, fail_message ) \ - expression + (void)(expression) + #define OSL_VERIFY_EQUALS( expression, compare, fail_message ) \ + (void)(expression) #endif #define OSL_UNUSED( expression ) \ - (void)expression; + (void)(expression) #endif // CONNECTIVITY_DIAGNOSE_EX_H --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
