diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-01-21 15:21:16 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-01-21 15:21:16 +0100 |
| commit | 7c704c78d3c652504c064b4ac7af55a2c1ee49bb (patch) | |
| tree | 623358cf25839219ef4fd90eea4f3eaa55389a1f /dbaccess | |
| parent | 0d5167915b47df7c3e450614ea50d845ba959df3 (diff) | |
Removed some unused parameters; added SAL_UNUSED_PARAMETER.
SAL_UNUSED_PARAMETER (expanding to __attribute__ ((unused)) for GCC)
is used to annotate legitimately unused parameters, so that static
analysis tools can tell legitimately unused parameters from truly
unnecessary ones. To that end, some patches for external modules
are also added, that are only applied when compiling with GCC and
add necessary __attribute__ ((unused)) in headers.
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/misc/services.cxx | 3 | ||||
| -rw-r--r-- | dbaccess/source/ext/macromigration/dbmm_services.cxx | 5 | ||||
| -rw-r--r-- | dbaccess/source/sdbtools/misc/sdbt_services.cxx | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx index 614e7d96a15b..4d7fc17fc96d 100644 --- a/dbaccess/source/core/misc/services.cxx +++ b/dbaccess/source/core/misc/services.cxx @@ -105,8 +105,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dba_component_getFactory( if (pServiceManager && pImplementationName) { xRet = ::dba::DbaModule::getInstance().getComponentFactory( - ::rtl::OUString::createFromAscii( pImplementationName ), - static_cast< XMultiServiceFactory* >( pServiceManager ) ); + ::rtl::OUString::createFromAscii( pImplementationName ) ); } if (xRet.is()) diff --git a/dbaccess/source/ext/macromigration/dbmm_services.cxx b/dbaccess/source/ext/macromigration/dbmm_services.cxx index ae5f1f3a1416..b444a7319177 100644 --- a/dbaccess/source/ext/macromigration/dbmm_services.cxx +++ b/dbaccess/source/ext/macromigration/dbmm_services.cxx @@ -48,10 +48,11 @@ namespace dbmm //........................................................................ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbmm_component_getFactory( - const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey ) + const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*, + SAL_UNUSED_PARAMETER void* ) { ::dbmm::initializeModule(); - return ::dbmm::MacroMigrationModule::getInstance().getComponentFactory( pImplementationName, pServiceManager, pRegistryKey ); + return ::dbmm::MacroMigrationModule::getInstance().getComponentFactory( pImplementationName ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx index c21dfdda54ab..b4276b3bd893 100644 --- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx +++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx @@ -63,8 +63,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdbt_component_getFactory( if (pServiceManager && pImplementationName) { xRet = ::sdbtools::SdbtModule::getInstance().getComponentFactory( - ::rtl::OUString::createFromAscii(pImplementationName), - static_cast< XMultiServiceFactory* >(pServiceManager)); + ::rtl::OUString::createFromAscii(pImplementationName)); } if (xRet.is()) |