summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-03-03 08:18:17 +0200
committerNoel Grandin <noel@peralex.com>2016-03-03 09:42:49 +0200
commit4dedf654d83ddc22c93d98fe6c7225b8e1e416bd (patch)
tree277a7fe13abd99e31f574ed358ccaa40c8d068be /connectivity
parent9fdd671fb276a419089f26e47739c4a783d15e93 (diff)
loplugin:unuseddefaultparams in connectivity
Change-Id: I03cc69a924913713a0da819899ce259305b88016
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/drivers/dbase/DIndex.cxx5
-rw-r--r--connectivity/source/drivers/dbase/dindexnode.cxx4
-rw-r--r--connectivity/source/drivers/hsqldb/HStorageAccess.cxx32
-rw-r--r--connectivity/source/drivers/postgresql/pq_preparedstatement.cxx9
-rw-r--r--connectivity/source/drivers/postgresql/pq_preparedstatement.hxx2
-rw-r--r--connectivity/source/drivers/postgresql/pq_statement.cxx8
-rw-r--r--connectivity/source/drivers/postgresql/pq_statement.hxx2
-rw-r--r--connectivity/source/inc/dbase/DIndex.hxx3
-rw-r--r--connectivity/source/inc/dbase/dindexnode.hxx2
-rw-r--r--connectivity/source/inc/hsqldb/HStorageAccess.hxx8
10 files changed, 18 insertions, 57 deletions
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 3a74eff2af91..78a162ec6dd2 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -172,11 +172,10 @@ bool ODbaseIndex::openIndexFile()
return m_pFileStream != nullptr;
}
-OIndexIterator* ODbaseIndex::createIterator(OBoolOperator* pOp,
- const OOperand* pOperand)
+OIndexIterator* ODbaseIndex::createIterator(OBoolOperator* pOp)
{
openIndexFile();
- return new OIndexIterator(this, pOp, pOperand);
+ return new OIndexIterator(this, pOp, nullptr);
}
bool ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue)
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 84d7cad7ce81..1697b7f9ce58 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -362,10 +362,10 @@ void ONDXPage::Release(bool bSave)
aParent.Clear();
}
-void ONDXPage::ReleaseFull(bool bSave)
+void ONDXPage::ReleaseFull()
{
ONDXPagePtr aTempParent = aParent;
- Release(bSave);
+ Release();
if (aTempParent.Is())
{
diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index 79c85879fbf8..34e818351c13 100644
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
@@ -143,7 +143,7 @@ extern "C" SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Nati
}
-jint read_from_storage_stream( JNIEnv * env, jobject /*obj_this*/, jstring name, jstring key, DataLogFile* logger )
+jint read_from_storage_stream( JNIEnv * env, jobject /*obj_this*/, jstring name, jstring key )
{
std::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key);
Reference< XInputStream> xIn = pHelper.get() ? pHelper->getInputStream() : Reference< XInputStream>();
@@ -172,12 +172,6 @@ jint read_from_storage_stream( JNIEnv * env, jobject /*obj_this*/, jstring name,
if (tmpInt < 0 )
tmpInt = 256 +tmpInt;
- if ( logger )
- {
-#ifdef HSQLDB_DBG
- logger->write( tmpInt );
-#endif
- }
return tmpInt;
}
}
@@ -205,7 +199,7 @@ extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Nativ
}
-jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key, jbyteArray buffer, jint off, jint len, DataLogFile* logger )
+jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key, jbyteArray buffer, jint off, jint len )
{
#ifdef HSQLDB_DBG
{
@@ -243,12 +237,6 @@ jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,js
return -1;
env->SetByteArrayRegion(buffer,off,nBytesRead,reinterpret_cast<jbyte*>(&aData[0]));
- if ( logger )
- {
-#ifdef HSQLDB_DBG
- logger->write( aData.getConstArray(), nBytesRead );
-#endif
- }
return nBytesRead;
}
ThrowException( env,
@@ -413,7 +401,7 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Nativ
}
-void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jstring name, jstring key, jbyteArray buffer, jint off, jint len, DataLogFile* logger )
+void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jstring name, jstring key, jbyteArray buffer, jint off, jint len )
{
std::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key);
Reference< XOutputStream> xOut = pHelper.get() ? pHelper->getOutputStream() : Reference< XOutputStream>();
@@ -435,12 +423,6 @@ void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jst
Sequence< ::sal_Int8 > aData(reinterpret_cast<sal_Int8 *>(buf + off),len);
env->ReleaseByteArrayElements(buffer, buf, JNI_ABORT);
xOut->writeBytes(aData);
- if ( logger )
- {
-#ifdef HSQLDB_DBG
- logger->write( aData.getConstArray(), len );
-#endif
- }
}
}
else
@@ -478,7 +460,7 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Nativ
}
-void write_to_storage_stream( JNIEnv* env, jobject /*obj_this*/, jstring name, jstring key, jint v, DataLogFile* logger )
+void write_to_storage_stream( JNIEnv* env, jobject /*obj_this*/, jstring name, jstring key, jint v )
{
std::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key);
Reference< XOutputStream> xOut = pHelper.get() ? pHelper->getOutputStream() : Reference< XOutputStream>();
@@ -494,12 +476,6 @@ void write_to_storage_stream( JNIEnv* env, jobject /*obj_this*/, jstring name, j
oneByte[3] = (sal_Int8) ((v >> 0) & 0xFF);
xOut->writeBytes(oneByte);
- if ( logger )
- {
-#ifdef HSQLDB_DBG
- logger->write( oneByte.getConstArray(), 4 );
-#endif
- }
}
else
{
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index 27fe0bd1a392..a5f3cad4f791 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -310,18 +310,11 @@ void PreparedStatement::close( ) throw (SQLException, RuntimeException, std::ex
}
}
-void PreparedStatement::raiseSQLException(
- const char * errorMsg, const char *errorType )
+void PreparedStatement::raiseSQLException( const char * errorMsg )
throw( SQLException )
{
OUStringBuffer buf(128);
buf.append( "pq_driver: ");
- if( errorType )
- {
- buf.append( "[" );
- buf.appendAscii( errorType );
- buf.append( "]" );
- }
buf.append(
OUString( errorMsg, strlen(errorMsg) , m_pSettings->encoding ) );
buf.append( " (caused by statement '" );
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx
index 2b412926a442..67a4a9ec9847 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx
@@ -250,7 +250,7 @@ public: // OComponentHelper
private:
void checkColumnIndex( sal_Int32 parameterIndex );
void checkClosed() throw (com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException);
- void raiseSQLException( const char * errorMsg, const char *errorType = nullptr )
+ void raiseSQLException( const char * errorMsg )
throw ( com::sun::star::sdbc::SQLException );
// PGresult *pgExecute( OString *pQuery );
};
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx
index bff2a1967340..8a0056a7ecdc 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -242,17 +242,11 @@ void Statement::close( ) throw (SQLException, RuntimeException, std::exception)
}
void Statement::raiseSQLException(
- const OUString & sql, const char * errorMsg, const char *errorType )
+ const OUString & sql, const char * errorMsg )
throw( SQLException )
{
OUStringBuffer buf(128);
buf.append( "pq_driver: ");
- if( errorType )
- {
- buf.append( "[" );
- buf.appendAscii( errorType );
- buf.append( "]" );
- }
buf.append(
OUString( errorMsg, strlen(errorMsg) , m_pSettings->encoding ) );
buf.append( " (caused by statement '" );
diff --git a/connectivity/source/drivers/postgresql/pq_statement.hxx b/connectivity/source/drivers/postgresql/pq_statement.hxx
index 920ff5df8b5a..a7fbceb03a45 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.hxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.hxx
@@ -176,7 +176,7 @@ public: // XResultSetMetaDataSupplier (is required by framework (see
private:
void checkClosed() throw (com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException);
- void raiseSQLException( const OUString & sql, const char * errorMsg, const char *errorType = nullptr )
+ void raiseSQLException( const OUString & sql, const char * errorMsg )
throw ( com::sun::star::sdbc::SQLException );
};
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index 2340761d12ad..7c20b1d660fe 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -105,8 +105,7 @@ namespace connectivity
const ODbaseTable* getTable() const { return m_pTable; }
const NDXHeader& getHeader() const { return m_aHeader; }
- OIndexIterator* createIterator(OBoolOperator_BASE* pOp,
- const OOperand_BASE* pOperand = nullptr);
+ OIndexIterator* createIterator(OBoolOperator_BASE* pOp);
void SetRootPos(sal_uInt32 nPos) {m_nRootPage = nPos;}
void SetPageCount(sal_uInt32 nCount) {m_nPageCount = nCount;}
diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx
index a056010ac186..7f6008311e39 100644
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/connectivity/source/inc/dbase/dindexnode.hxx
@@ -137,7 +137,7 @@ namespace connectivity
bool Delete(sal_uInt16);
void Remove(sal_uInt16);
void Release(bool bSave = true);
- void ReleaseFull(bool bSave = true);
+ void ReleaseFull();
// Split and merge
ONDXNode Split(ONDXPage& rPage);
diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.hxx b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
index 00e53a7c1ba4..7fe654119976 100644
--- a/connectivity/source/inc/hsqldb/HStorageAccess.hxx
+++ b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
@@ -29,10 +29,10 @@ namespace connectivity { namespace hsqldb
class DataLogFile;
} }
-jint read_from_storage_stream( JNIEnv * env, jobject obj_this, jstring name, jstring key, ::connectivity::hsqldb::DataLogFile* logger = nullptr );
-jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len, ::connectivity::hsqldb::DataLogFile* logger = nullptr );
-void write_to_storage_stream_from_buffer( JNIEnv* env, jobject obj_this, jstring name, jstring key, jbyteArray buffer, jint off, jint len, ::connectivity::hsqldb::DataLogFile* logger = nullptr );
-void write_to_storage_stream( JNIEnv* env, jobject obj_this, jstring name, jstring key, jint v, ::connectivity::hsqldb::DataLogFile* logger = nullptr );
+jint read_from_storage_stream( JNIEnv * env, jobject obj_this, jstring name, jstring key );
+jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len );
+void write_to_storage_stream_from_buffer( JNIEnv* env, jobject obj_this, jstring name, jstring key, jbyteArray buffer, jint off, jint len );
+void write_to_storage_stream( JNIEnv* env, jobject obj_this, jstring name, jstring key, jint v );
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEACCESS_HXX