From 3af500580b1c82eabd60335c9ebc458a3f68850c Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Fri, 8 Dec 2017 15:58:41 +0200
Subject: 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>
---
 store/source/storbios.cxx |  2 +-
 store/source/store.cxx    | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'store/source')

diff --git a/store/source/storbios.cxx b/store/source/storbios.cxx
index 5d42354b6a62..38673f7b8165 100644
--- a/store/source/storbios.cxx
+++ b/store/source/storbios.cxx
@@ -460,7 +460,7 @@ protected:
  * OStorePageBIOS::AceCache implementation.
  *
  *======================================================================*/
-extern "C"  typedef  int (SAL_CALL * ace_constructor_type)(void*,void*);
+extern "C"  typedef  int (* ace_constructor_type)(void*,void*);
 
 OStorePageBIOS::AceCache &
 OStorePageBIOS::AceCache::get()
diff --git a/store/source/store.cxx b/store/source/store.cxx
index 558d8ff0eae0..a7c7a7ae1099 100644
--- a/store/source/store.cxx
+++ b/store/source/store.cxx
@@ -64,7 +64,7 @@ using namespace store;
 /*
  * store_acquireHandle.
  */
-storeError SAL_CALL store_acquireHandle (
+storeError store_acquireHandle (
     storeHandle Handle
 ) SAL_THROW_EXTERN_C()
 {
@@ -79,7 +79,7 @@ storeError SAL_CALL store_acquireHandle (
 /*
  * store_releaseHandle.
  */
-storeError SAL_CALL store_releaseHandle (
+storeError store_releaseHandle (
     storeHandle Handle
 ) SAL_THROW_EXTERN_C()
 {
@@ -99,7 +99,7 @@ storeError SAL_CALL store_releaseHandle (
 /*
  * store_createMemoryFile.
  */
-storeError SAL_CALL store_createMemoryFile (
+storeError store_createMemoryFile (
     sal_uInt16       nPageSize,
     storeFileHandle *phFile
 ) SAL_THROW_EXTERN_C()
@@ -133,7 +133,7 @@ storeError SAL_CALL store_createMemoryFile (
 /*
  * store_openFile.
  */
-storeError SAL_CALL store_openFile (
+storeError store_openFile (
     rtl_uString     *pFilename,
     storeAccessMode  eAccessMode,
     sal_uInt16       nPageSize,
@@ -171,7 +171,7 @@ storeError SAL_CALL store_openFile (
 /*
  * store_closeFile.
  */
-storeError SAL_CALL store_closeFile (
+storeError store_closeFile (
     storeFileHandle Handle
 ) SAL_THROW_EXTERN_C()
 {
@@ -188,7 +188,7 @@ storeError SAL_CALL store_closeFile (
 /*
  * store_flushFile.
  */
-storeError SAL_CALL store_flushFile (
+storeError store_flushFile (
     storeFileHandle Handle
 ) SAL_THROW_EXTERN_C()
 {
@@ -208,7 +208,7 @@ storeError SAL_CALL store_flushFile (
 /*
  * store_openDirectory.
  */
-storeError SAL_CALL store_openDirectory (
+storeError store_openDirectory (
     storeFileHandle       hFile,
     rtl_uString const    *pPath,
     rtl_uString const    *pName,
@@ -248,7 +248,7 @@ storeError SAL_CALL store_openDirectory (
 /*
  * store_findFirst.
  */
-storeError SAL_CALL store_findFirst (
+storeError store_findFirst (
     storeDirectoryHandle  Handle,
     storeFindData        *pFindData
 ) SAL_THROW_EXTERN_C()
@@ -272,7 +272,7 @@ storeError SAL_CALL store_findFirst (
 /*
  * store_findNext.
  */
-storeError SAL_CALL store_findNext (
+storeError store_findNext (
     storeDirectoryHandle  Handle,
     storeFindData        *pFindData
 ) SAL_THROW_EXTERN_C()
@@ -302,7 +302,7 @@ storeError SAL_CALL store_findNext (
 /*
  * store_openStream
  */
-storeError SAL_CALL store_openStream (
+storeError store_openStream (
     storeFileHandle    hFile,
     rtl_uString const *pPath,
     rtl_uString const *pName,
@@ -342,7 +342,7 @@ storeError SAL_CALL store_openStream (
 /*
  * store_readStream.
  */
-storeError SAL_CALL store_readStream (
+storeError store_readStream (
     storeStreamHandle  Handle,
     sal_uInt32         nOffset,
     void              *pBuffer,
@@ -364,7 +364,7 @@ storeError SAL_CALL store_readStream (
 /*
  * store_writeStream.
  */
-storeError SAL_CALL store_writeStream (
+storeError store_writeStream (
     storeStreamHandle  Handle,
     sal_uInt32         nOffset,
     const void        *pBuffer,
@@ -386,7 +386,7 @@ storeError SAL_CALL store_writeStream (
 /*
  * store_remove.
  */
-storeError SAL_CALL store_remove (
+storeError store_remove (
     storeFileHandle Handle,
     rtl_uString const *pPath,
     rtl_uString const *pName
-- 
cgit