loplugin:salcall fix functions

since cdecl is the default calling convention on Windows for
such functions, the annotation is redundant.

Change-Id: I1a85fa27e5ac65ce0e04a19bde74c90800ffaa2d
Reviewed-on: https://gerrit.libreoffice.org/46164
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 28 insertions, 28 deletions

diff --git a/cppu/source/uno/IdentityMapping.cxx b/cppu/source/uno/IdentityMapping.cxx
index 659c9cdc7385..36f0d15192c4 100644
--- a/cppu/source/uno/IdentityMapping.cxx
+++ b/cppu/source/uno/IdentityMapping.cxx
@@ -39,12 +39,12 @@ struct IdentityMapping : public uno_Mapping
 extern "C"
 {
 
-static void SAL_CALL s_free(uno_Mapping * pMapping)
+static void s_free(uno_Mapping * pMapping)
 {
     delete static_cast<IdentityMapping *>(pMapping);
 }
 
-static void SAL_CALL s_acquire(uno_Mapping * pMapping)
+static void s_acquire(uno_Mapping * pMapping)
 {
     static rtl::OUString s_purpose;
 
@@ -59,13 +59,13 @@ static void SAL_CALL s_acquire(uno_Mapping * pMapping)
     }
 }
 
-static void SAL_CALL s_release(uno_Mapping * pMapping)
+static void s_release(uno_Mapping * pMapping)
 {
     if (!osl_atomic_decrement(&static_cast<IdentityMapping *>(pMapping )->m_nRef))
         uno_revokeMapping(pMapping);
 }
 
-static void SAL_CALL s_mapInterface(uno_Mapping                       * pMapping,
+static void s_mapInterface(uno_Mapping                       * pMapping,
                                     void                             ** ppOut,
                                     void                              * pInterface,
                                     SAL_UNUSED_PARAMETER typelib_InterfaceTypeDescription * /*pInterfaceTypeDescr*/)
diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx
index 81ef313cfcf3..60a8704e8347 100644
--- a/cppu/source/uno/cascade_mapping.cxx
+++ b/cppu/source/uno/cascade_mapping.cxx
@@ -54,19 +54,19 @@ public:
 };
 
 extern "C" {
-static void SAL_CALL s_acquire(uno_Mapping * mapping)
+static void s_acquire(uno_Mapping * mapping)
 {
     MediatorMapping * pMediatorMapping = static_cast<MediatorMapping *>(mapping);
     pMediatorMapping->acquire();
 }
 
-static void SAL_CALL s_release(uno_Mapping * mapping)
+static void s_release(uno_Mapping * mapping)
 {
     MediatorMapping * pMediatorMapping = static_cast<MediatorMapping *>(mapping);
     pMediatorMapping->release();
 }
 
-static void SAL_CALL s_mapInterface(
+static void s_mapInterface(
     uno_Mapping                      * mapping,
     void                            ** ppOut,
     void                             * pInterface,
@@ -144,7 +144,7 @@ void MediatorMapping::mapInterface(
     *ppOut = ret;
 }
 
-extern "C" { static void SAL_CALL s_MediatorMapping_free(uno_Mapping * pMapping)
+extern "C" { static void s_MediatorMapping_free(uno_Mapping * pMapping)
     SAL_THROW_EXTERN_C()
 {
     delete static_cast<MediatorMapping *>(pMapping);
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 76bf88e6e002..8ca96dc0a7ae 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -226,7 +226,7 @@ extern "C"
 {
 
 
-static void SAL_CALL defenv_registerInterface(
+static void defenv_registerInterface(
     uno_ExtEnvironment * pEnv, void ** ppInterface,
     rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr )
 {
@@ -273,7 +273,7 @@ static void SAL_CALL defenv_registerInterface(
 }
 
 
-static void SAL_CALL defenv_registerProxyInterface(
+static void defenv_registerProxyInterface(
     uno_ExtEnvironment * pEnv, void ** ppInterface, uno_freeProxyFunc freeProxy,
     rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr )
 {
@@ -331,7 +331,7 @@ static void SAL_CALL defenv_registerProxyInterface(
 }
 
 
-static void SAL_CALL s_stub_defenv_revokeInterface(va_list * pParam)
+static void s_stub_defenv_revokeInterface(va_list * pParam)
 {
     uno_ExtEnvironment * pEnv       = va_arg(*pParam, uno_ExtEnvironment *);
     void               * pInterface = va_arg(*pParam, void *);
@@ -418,13 +418,13 @@ static void SAL_CALL s_stub_defenv_revokeInterface(va_list * pParam)
     }
 }
 
-static void SAL_CALL defenv_revokeInterface(uno_ExtEnvironment * pEnv, void * pInterface)
+static void defenv_revokeInterface(uno_ExtEnvironment * pEnv, void * pInterface)
 {
     uno_Environment_invoke(&pEnv->aBase, s_stub_defenv_revokeInterface, pEnv, pInterface);
 }
 
 
-static void SAL_CALL defenv_getObjectIdentifier(
+static void defenv_getObjectIdentifier(
     uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface )
 {
     OSL_ENSURE( pEnv && ppOId && pInterface, "### null ptr!" );
@@ -454,7 +454,7 @@ static void SAL_CALL defenv_getObjectIdentifier(
 }
 
 
-static void SAL_CALL defenv_getRegisteredInterface(
+static void defenv_getRegisteredInterface(
     uno_ExtEnvironment * pEnv, void ** ppInterface,
     rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr )
 {
@@ -484,7 +484,7 @@ static void SAL_CALL defenv_getRegisteredInterface(
 }
 
 
-static void SAL_CALL defenv_getRegisteredInterfaces(
+static void defenv_getRegisteredInterfaces(
     uno_ExtEnvironment * pEnv, void *** pppInterfaces, sal_Int32 * pnLen,
     uno_memAlloc memAlloc )
 {
@@ -510,7 +510,7 @@ static void SAL_CALL defenv_getRegisteredInterfaces(
 }
 
 
-static void SAL_CALL defenv_acquire( uno_Environment * pEnv )
+static void defenv_acquire( uno_Environment * pEnv )
 {
     uno_DefaultEnvironment * that = reinterpret_cast<uno_DefaultEnvironment *>(pEnv);
     osl_atomic_increment( &that->nWeakRef );
@@ -518,7 +518,7 @@ static void SAL_CALL defenv_acquire( uno_Environment * pEnv )
 }
 
 
-static void SAL_CALL defenv_release( uno_Environment * pEnv )
+static void defenv_release( uno_Environment * pEnv )
 {
     uno_DefaultEnvironment * that = reinterpret_cast<uno_DefaultEnvironment *>(pEnv);
     if (! osl_atomic_decrement( &that->nRef ))
@@ -539,14 +539,14 @@ static void SAL_CALL defenv_release( uno_Environment * pEnv )
 }
 
 
-static void SAL_CALL defenv_acquireWeak( uno_Environment * pEnv )
+static void defenv_acquireWeak( uno_Environment * pEnv )
 {
     uno_DefaultEnvironment * that = reinterpret_cast<uno_DefaultEnvironment *>(pEnv);
     osl_atomic_increment( &that->nWeakRef );
 }
 
 
-static void SAL_CALL defenv_releaseWeak( uno_Environment * pEnv )
+static void defenv_releaseWeak( uno_Environment * pEnv )
 {
     uno_DefaultEnvironment * that = reinterpret_cast<uno_DefaultEnvironment *>(pEnv);
     if (! osl_atomic_decrement( &that->nWeakRef ))
@@ -556,7 +556,7 @@ static void SAL_CALL defenv_releaseWeak( uno_Environment * pEnv )
 }
 
 
-static void SAL_CALL defenv_harden(
+static void defenv_harden(
     uno_Environment ** ppHardEnv, uno_Environment * pEnv )
 {
     if (*ppHardEnv)
@@ -584,7 +584,7 @@ static void SAL_CALL defenv_harden(
 }
 
 
-static void SAL_CALL defenv_dispose( SAL_UNUSED_PARAMETER uno_Environment * )
+static void defenv_dispose( SAL_UNUSED_PARAMETER uno_Environment * )
 {
 }
 }
@@ -837,7 +837,7 @@ extern "C"
 {
 
 
-static void SAL_CALL unoenv_computeObjectIdentifier(
+static void unoenv_computeObjectIdentifier(
     uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface )
 {
     assert(pEnv && ppOId && pInterface && "### null ptr!");
@@ -872,7 +872,7 @@ static void SAL_CALL unoenv_computeObjectIdentifier(
 }
 
 
-static void SAL_CALL unoenv_acquireInterface(
+static void unoenv_acquireInterface(
     SAL_UNUSED_PARAMETER uno_ExtEnvironment *, void * pUnoI_ )
 {
     uno_Interface * pUnoI = static_cast< uno_Interface * >(pUnoI_);
@@ -880,7 +880,7 @@ static void SAL_CALL unoenv_acquireInterface(
 }
 
 
-static void SAL_CALL unoenv_releaseInterface(
+static void unoenv_releaseInterface(
     SAL_UNUSED_PARAMETER uno_ExtEnvironment *, void * pUnoI_ )
 {
     uno_Interface * pUnoI = static_cast< uno_Interface * >(pUnoI_);
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 74e167eb336c..4c8aa60895ab 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -197,12 +197,12 @@ struct uno_Mediate_Mapping : public uno_Mapping
 extern "C"
 {
 
-static void SAL_CALL mediate_free( uno_Mapping * pMapping )
+static void mediate_free( uno_Mapping * pMapping )
 {
     delete static_cast< uno_Mediate_Mapping * >( pMapping );
 }
 
-static void SAL_CALL mediate_acquire( uno_Mapping * pMapping )
+static void mediate_acquire( uno_Mapping * pMapping )
 {
     if (1 == osl_atomic_increment(
         & static_cast< uno_Mediate_Mapping * >( pMapping )->nRef ))
@@ -215,7 +215,7 @@ static void SAL_CALL mediate_acquire( uno_Mapping * pMapping )
     }
 }
 
-static void SAL_CALL mediate_release( uno_Mapping * pMapping )
+static void mediate_release( uno_Mapping * pMapping )
 {
     if (! osl_atomic_decrement(
         & static_cast< uno_Mediate_Mapping * >( pMapping )->nRef ))
@@ -224,7 +224,7 @@ static void SAL_CALL mediate_release( uno_Mapping * pMapping )
     }
 }
 
-static void SAL_CALL mediate_mapInterface(
+static void mediate_mapInterface(
     uno_Mapping * pMapping,
     void ** ppOut, void * pInterface,
     typelib_InterfaceTypeDescription * pInterfaceTypeDescr )