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>

5 files changed, 18 insertions, 18 deletions

diff --git a/sal/rtl/alloc_arena.cxx b/sal/rtl/alloc_arena.cxx
index 8f9c64e0919e..ba28f6f532f0 100644
--- a/sal/rtl/alloc_arena.cxx
+++ b/sal/rtl/alloc_arena.cxx
@@ -58,12 +58,12 @@ rtl_arena_type * gp_default_arena = nullptr;
 namespace
 {
 
-void * SAL_CALL rtl_machdep_alloc(
+void * rtl_machdep_alloc(
     rtl_arena_type * pArena,
     sal_Size *       pSize
 );
 
-void SAL_CALL rtl_machdep_free(
+void rtl_machdep_free(
     rtl_arena_type * pArena,
     void *           pAddr,
     sal_Size         nSize
@@ -999,7 +999,7 @@ void SAL_CALL rtl_arena_free (
 namespace
 {
 
-void * SAL_CALL rtl_machdep_alloc(
+void * rtl_machdep_alloc(
     rtl_arena_type * pArena,
     sal_Size *       pSize
 )
@@ -1049,7 +1049,7 @@ void * SAL_CALL rtl_machdep_alloc(
     return nullptr;
 }
 
-void SAL_CALL rtl_machdep_free(
+void rtl_machdep_free(
     rtl_arena_type * pArena,
     void *           pAddr,
     sal_Size         nSize
diff --git a/sal/rtl/alloc_global.cxx b/sal/rtl/alloc_global.cxx
index 47643f3ea74a..25e2c1ea78b6 100644
--- a/sal/rtl/alloc_global.cxx
+++ b/sal/rtl/alloc_global.cxx
@@ -72,7 +72,7 @@ static rtl_cache_type * g_alloc_table[RTL_MEMORY_CACHED_LIMIT >> RTL_MEMALIGN_SH
 
 static rtl_arena_type * gp_alloc_arena = nullptr;
 
-void * SAL_CALL rtl_allocateMemory_CUSTOM(sal_Size n) SAL_THROW_EXTERN_C()
+void * rtl_allocateMemory_CUSTOM(sal_Size n) SAL_THROW_EXTERN_C()
 {
     void * p = nullptr;
     if (n > 0)
@@ -111,7 +111,7 @@ try_alloc:
     return p;
 }
 
-void SAL_CALL rtl_freeMemory_CUSTOM (void * p) SAL_THROW_EXTERN_C()
+void rtl_freeMemory_CUSTOM (void * p) SAL_THROW_EXTERN_C()
 {
     if (p)
     {
@@ -125,7 +125,7 @@ void SAL_CALL rtl_freeMemory_CUSTOM (void * p) SAL_THROW_EXTERN_C()
     }
 }
 
-void * SAL_CALL rtl_reallocateMemory_CUSTOM (void * p, sal_Size n) SAL_THROW_EXTERN_C()
+void * rtl_reallocateMemory_CUSTOM (void * p, sal_Size n) SAL_THROW_EXTERN_C()
 {
     if (n > 0)
     {
@@ -226,17 +226,17 @@ void rtl_memory_fini()
 #endif
 }
 
-void * SAL_CALL rtl_allocateMemory_SYSTEM(sal_Size n)
+void * rtl_allocateMemory_SYSTEM(sal_Size n)
 {
     return malloc (n);
 }
 
-void SAL_CALL rtl_freeMemory_SYSTEM(void * p)
+void rtl_freeMemory_SYSTEM(void * p)
 {
     free (p);
 }
 
-void * SAL_CALL rtl_reallocateMemory_SYSTEM(void * p, sal_Size n)
+void * rtl_reallocateMemory_SYSTEM(void * p, sal_Size n)
 {
     return realloc (p, n);
 }
diff --git a/sal/rtl/cipher.cxx b/sal/rtl/cipher.cxx
index 80e096f5a3a1..735b2eb0d1c0 100644
--- a/sal/rtl/cipher.cxx
+++ b/sal/rtl/cipher.cxx
@@ -82,18 +82,18 @@
     } \
 }
 
-typedef rtlCipherError(SAL_CALL cipher_init_t) (
+typedef rtlCipherError(cipher_init_t) (
     rtlCipher          Cipher,
     rtlCipherDirection Direction,
     const sal_uInt8 *pKeyData, sal_Size nKeyLen,
     const sal_uInt8 *pArgData, sal_Size nArgLen);
 
-typedef rtlCipherError(SAL_CALL cipher_update_t) (
+typedef rtlCipherError(cipher_update_t) (
     rtlCipher   Cipher,
     const void *pData,   sal_Size nDatLen,
     sal_uInt8  *pBuffer, sal_Size nBufLen);
 
-typedef void (SAL_CALL cipher_delete_t) (rtlCipher Cipher);
+typedef void (cipher_delete_t) (rtlCipher Cipher);
 
 struct Cipher_Impl
 {
diff --git a/sal/rtl/digest.cxx b/sal/rtl/digest.cxx
index 85d7357ef6fc..4d4fb59ce3f4 100644
--- a/sal/rtl/digest.cxx
+++ b/sal/rtl/digest.cxx
@@ -40,15 +40,15 @@
      *((c)++) = (sal_uInt8)(((l) >> 16) & 0xff), \
      *((c)++) = (sal_uInt8)(((l) >> 24) & 0xff))
 
-typedef rtlDigestError (SAL_CALL Digest_init_t) (
+typedef rtlDigestError (Digest_init_t) (
     void *ctx, const sal_uInt8 *Data, sal_uInt32 DatLen);
 
-typedef void (SAL_CALL Digest_delete_t) (void *ctx);
+typedef void (Digest_delete_t) (void *ctx);
 
-typedef rtlDigestError (SAL_CALL Digest_update_t) (
+typedef rtlDigestError (Digest_update_t) (
     void *ctx, const void *Data, sal_uInt32 DatLen);
 
-typedef rtlDigestError (SAL_CALL Digest_get_t) (
+typedef rtlDigestError (Digest_get_t) (
     void *ctx, sal_uInt8 *Buffer, sal_uInt32 BufLen);
 
 struct Digest_Impl
diff --git a/sal/rtl/string.cxx b/sal/rtl/string.cxx
index 8dbcee763a95..c7a868cb9957 100644
--- a/sal/rtl/string.cxx
+++ b/sal/rtl/string.cxx
@@ -189,7 +189,7 @@ static int rtl_ImplGetFastUTF8ByteLen( const sal_Unicode* pStr, sal_Int32 nLen )
 
 /* ----------------------------------------------------------------------- */
 
-bool SAL_CALL rtl_impl_convertUStringToString(rtl_String ** pTarget,
+bool rtl_impl_convertUStringToString(rtl_String ** pTarget,
                                                   sal_Unicode const * pSource,
                                                   sal_Int32 nLength,
                                                   rtl_TextEncoding nEncoding,