User: hr Date: 06/06/19 18:56:01 Modified: /dba/connectivity/source/drivers/odbc/ ORealDriver.cxx
Log: INTEGRATION: CWS warnings01 (1.4.30); FILE MERGED 2005/11/21 10:07:56 fs 1.4.30.2: #i57457# warning-free code on unx* 2005/11/07 14:44:02 fs 1.4.30.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/drivers/odbc/ ================================================= File [changed]: ORealDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/odbc/ORealDriver.cxx?r1=1.4&r2=1.5 Delta lines: +111 -107 ----------------------- --- ORealDriver.cxx 8 Sep 2005 06:35:11 -0000 1.4 +++ ORealDriver.cxx 20 Jun 2006 01:55:58 -0000 1.5 @@ -42,6 +42,9 @@ #ifndef _CONNECTIVITY_ODBC_OFUNCTIONS_HXX_ #include "odbc/OFunctions.hxx" #endif +#ifndef CONNECTIVITY_DIAGNOSE_EX_H +#include "diagnose_ex.h" +#endif namespace connectivity { @@ -116,227 +119,227 @@ class ORealObdcDriver : public ODBCDriver { protected: - virtual void* getOdbcFunction(sal_Int32 _nIndex) const; + virtual oslGenericFunction getOdbcFunction(sal_Int32 _nIndex) const; virtual SQLHANDLE EnvironmentHandle(::rtl::OUString &_rPath); public: ORealObdcDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) : ODBCDriver(_rxFactory) {} }; //------------------------------------------------------------------ -void* ORealObdcDriver::getOdbcFunction(sal_Int32 _nIndex) const +oslGenericFunction ORealObdcDriver::getOdbcFunction(sal_Int32 _nIndex) const { - void* pFunction = NULL; + oslGenericFunction pFunction = NULL; switch(_nIndex) { case ODBC3SQLAllocHandle: - pFunction = (void*)pODBC3SQLAllocHandle;; + pFunction = (oslGenericFunction)pODBC3SQLAllocHandle; break; case ODBC3SQLConnect: - pFunction = (void*)pODBC3SQLConnect; + pFunction = (oslGenericFunction)pODBC3SQLConnect; break; case ODBC3SQLDriverConnect: - pFunction = (void*)pODBC3SQLDriverConnect; + pFunction = (oslGenericFunction)pODBC3SQLDriverConnect; break; case ODBC3SQLBrowseConnect: - pFunction = (void*)pODBC3SQLBrowseConnect; + pFunction = (oslGenericFunction)pODBC3SQLBrowseConnect; break; case ODBC3SQLDataSources: - pFunction = (void*)pODBC3SQLDataSources; + pFunction = (oslGenericFunction)pODBC3SQLDataSources; break; case ODBC3SQLDrivers: - pFunction = (void*)pODBC3SQLDrivers; + pFunction = (oslGenericFunction)pODBC3SQLDrivers; break; case ODBC3SQLGetInfo: - pFunction = (void*)pODBC3SQLGetInfo; + pFunction = (oslGenericFunction)pODBC3SQLGetInfo; break; case ODBC3SQLGetFunctions: - pFunction = (void*)pODBC3SQLGetFunctions; + pFunction = (oslGenericFunction)pODBC3SQLGetFunctions; break; case ODBC3SQLGetTypeInfo: - pFunction = (void*)pODBC3SQLGetTypeInfo; + pFunction = (oslGenericFunction)pODBC3SQLGetTypeInfo; break; case ODBC3SQLSetConnectAttr: - pFunction = (void*)pODBC3SQLSetConnectAttr; + pFunction = (oslGenericFunction)pODBC3SQLSetConnectAttr; break; case ODBC3SQLGetConnectAttr: - pFunction = (void*)pODBC3SQLGetConnectAttr; + pFunction = (oslGenericFunction)pODBC3SQLGetConnectAttr; break; case ODBC3SQLSetEnvAttr: - pFunction = (void*)pODBC3SQLSetEnvAttr; + pFunction = (oslGenericFunction)pODBC3SQLSetEnvAttr; break; case ODBC3SQLGetEnvAttr: - pFunction = (void*)pODBC3SQLGetEnvAttr; + pFunction = (oslGenericFunction)pODBC3SQLGetEnvAttr; break; case ODBC3SQLSetStmtAttr: - pFunction = (void*)pODBC3SQLSetStmtAttr; + pFunction = (oslGenericFunction)pODBC3SQLSetStmtAttr; break; case ODBC3SQLGetStmtAttr: - pFunction = (void*)pODBC3SQLGetStmtAttr; + pFunction = (oslGenericFunction)pODBC3SQLGetStmtAttr; break; case ODBC3SQLPrepare: - pFunction = (void*)pODBC3SQLPrepare; + pFunction = (oslGenericFunction)pODBC3SQLPrepare; break; case ODBC3SQLBindParameter: - pFunction = (void*)pODBC3SQLBindParameter; + pFunction = (oslGenericFunction)pODBC3SQLBindParameter; break; case ODBC3SQLSetCursorName: - pFunction = (void*)pODBC3SQLSetCursorName; + pFunction = (oslGenericFunction)pODBC3SQLSetCursorName; break; case ODBC3SQLExecute: - pFunction = (void*)pODBC3SQLExecute; + pFunction = (oslGenericFunction)pODBC3SQLExecute; break; case ODBC3SQLExecDirect: - pFunction = (void*)pODBC3SQLExecDirect; + pFunction = (oslGenericFunction)pODBC3SQLExecDirect; break; case ODBC3SQLDescribeParam: - pFunction = (void*)pODBC3SQLDescribeParam; + pFunction = (oslGenericFunction)pODBC3SQLDescribeParam; break; case ODBC3SQLNumParams: - pFunction = (void*)pODBC3SQLNumParams; + pFunction = (oslGenericFunction)pODBC3SQLNumParams; break; case ODBC3SQLParamData: - pFunction = (void*)pODBC3SQLParamData; + pFunction = (oslGenericFunction)pODBC3SQLParamData; break; case ODBC3SQLPutData: - pFunction = (void*)pODBC3SQLPutData; + pFunction = (oslGenericFunction)pODBC3SQLPutData; break; case ODBC3SQLRowCount: - pFunction = (void*)pODBC3SQLRowCount; + pFunction = (oslGenericFunction)pODBC3SQLRowCount; break; case ODBC3SQLNumResultCols: - pFunction = (void*)pODBC3SQLNumResultCols; + pFunction = (oslGenericFunction)pODBC3SQLNumResultCols; break; case ODBC3SQLDescribeCol: - pFunction = (void*)pODBC3SQLDescribeCol; + pFunction = (oslGenericFunction)pODBC3SQLDescribeCol; break; case ODBC3SQLColAttribute: - pFunction = (void*)pODBC3SQLColAttribute; + pFunction = (oslGenericFunction)pODBC3SQLColAttribute; break; case ODBC3SQLBindCol: - pFunction = (void*)pODBC3SQLBindCol; + pFunction = (oslGenericFunction)pODBC3SQLBindCol; break; case ODBC3SQLFetch: - pFunction = (void*)pODBC3SQLFetch; + pFunction = (oslGenericFunction)pODBC3SQLFetch; break; case ODBC3SQLFetchScroll: - pFunction = (void*)pODBC3SQLFetchScroll; + pFunction = (oslGenericFunction)pODBC3SQLFetchScroll; break; case ODBC3SQLGetData: - pFunction = (void*)pODBC3SQLGetData; + pFunction = (oslGenericFunction)pODBC3SQLGetData; break; case ODBC3SQLSetPos: - pFunction = (void*)pODBC3SQLSetPos; + pFunction = (oslGenericFunction)pODBC3SQLSetPos; break; case ODBC3SQLBulkOperations: - pFunction = (void*)pODBC3SQLBulkOperations; + pFunction = (oslGenericFunction)pODBC3SQLBulkOperations; break; case ODBC3SQLMoreResults: - pFunction = (void*)pODBC3SQLMoreResults; + pFunction = (oslGenericFunction)pODBC3SQLMoreResults; break; case ODBC3SQLGetDiagRec: - pFunction = (void*)pODBC3SQLGetDiagRec; + pFunction = (oslGenericFunction)pODBC3SQLGetDiagRec; break; case ODBC3SQLColumnPrivileges: - pFunction = (void*)pODBC3SQLColumnPrivileges; + pFunction = (oslGenericFunction)pODBC3SQLColumnPrivileges; break; case ODBC3SQLColumns: - pFunction = (void*)pODBC3SQLColumns; + pFunction = (oslGenericFunction)pODBC3SQLColumns; break; case ODBC3SQLForeignKeys: - pFunction = (void*)pODBC3SQLForeignKeys; + pFunction = (oslGenericFunction)pODBC3SQLForeignKeys; break; case ODBC3SQLPrimaryKeys: - pFunction = (void*)pODBC3SQLPrimaryKeys; + pFunction = (oslGenericFunction)pODBC3SQLPrimaryKeys; break; case ODBC3SQLProcedureColumns: - pFunction = (void*)pODBC3SQLProcedureColumns; + pFunction = (oslGenericFunction)pODBC3SQLProcedureColumns; break; case ODBC3SQLProcedures: - pFunction = (void*)pODBC3SQLProcedures; + pFunction = (oslGenericFunction)pODBC3SQLProcedures; break; case ODBC3SQLSpecialColumns: - pFunction = (void*)pODBC3SQLSpecialColumns; + pFunction = (oslGenericFunction)pODBC3SQLSpecialColumns; break; case ODBC3SQLStatistics: - pFunction = (void*)pODBC3SQLStatistics; + pFunction = (oslGenericFunction)pODBC3SQLStatistics; break; case ODBC3SQLTablePrivileges: - pFunction = (void*)pODBC3SQLTablePrivileges; + pFunction = (oslGenericFunction)pODBC3SQLTablePrivileges; break; case ODBC3SQLTables: - pFunction = (void*)pODBC3SQLTables; + pFunction = (oslGenericFunction)pODBC3SQLTables; break; case ODBC3SQLFreeStmt: - pFunction = (void*)pODBC3SQLFreeStmt; + pFunction = (oslGenericFunction)pODBC3SQLFreeStmt; break; case ODBC3SQLCloseCursor: - pFunction = (void*)pODBC3SQLCloseCursor; + pFunction = (oslGenericFunction)pODBC3SQLCloseCursor; break; case ODBC3SQLCancel: - pFunction = (void*)pODBC3SQLCancel; + pFunction = (oslGenericFunction)pODBC3SQLCancel; break; case ODBC3SQLEndTran: - pFunction = (void*)pODBC3SQLEndTran; + pFunction = (oslGenericFunction)pODBC3SQLEndTran; break; case ODBC3SQLDisconnect: - pFunction = (void*)pODBC3SQLDisconnect; + pFunction = (oslGenericFunction)pODBC3SQLDisconnect; break; case ODBC3SQLFreeHandle: - pFunction = (void*)pODBC3SQLFreeHandle; + pFunction = (oslGenericFunction)pODBC3SQLFreeHandle; break; case ODBC3SQLGetCursorName: - pFunction = (void*)pODBC3SQLGetCursorName; + pFunction = (oslGenericFunction)pODBC3SQLGetCursorName; break; case ODBC3SQLNativeSql: - pFunction = (void*)pODBC3SQLNativeSql; + pFunction = (oslGenericFunction)pODBC3SQLNativeSql; break; default: OSL_ENSURE(0,"Function unknown!"); @@ -366,6 +369,7 @@ // In globaler Struktur merken ... m_pDriverHandle = h; SQLRETURN nError = N3SQLSetEnvAttr(h, SQL_ATTR_ODBC_VERSION,(SQLPOINTER) SQL_OV_ODBC3, SQL_IS_UINTEGER); + OSL_UNUSED( nError ); //N3SQLSetEnvAttr(h, SQL_ATTR_CONNECTION_POOLING,(SQLPOINTER) SQL_CP_ONE_PER_HENV, SQL_IS_INTEGER); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
