From 3af500580b1c82eabd60335c9ebc458a3f68850c Mon Sep 17 00:00:00 2001 From: Noel Grandin 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 Reviewed-by: Noel Grandin --- sal/osl/all/compat.cxx | 4 ++-- sal/osl/all/filepath.cxx | 2 +- sal/osl/unx/file_path_helper.cxx | 16 +++++++-------- sal/osl/unx/file_path_helper.hxx | 16 +++++++-------- sal/osl/unx/pipe.cxx | 4 ++-- sal/osl/unx/process.cxx | 4 ++-- sal/osl/unx/process_impl.cxx | 2 +- sal/osl/unx/profile.cxx | 4 ++-- sal/osl/unx/secimpl.hxx | 2 +- sal/osl/unx/security.cxx | 14 ++++++------- sal/osl/unx/socket.cxx | 40 ++++++++++++++++++------------------ sal/qa/osl/module/osl_Module_DLL.cxx | 2 +- sal/qa/osl/process/osl_Thread.cxx | 2 +- sal/rtl/alloc_arena.cxx | 8 ++++---- sal/rtl/alloc_global.cxx | 12 +++++------ sal/rtl/cipher.cxx | 6 +++--- sal/rtl/digest.cxx | 8 ++++---- sal/rtl/string.cxx | 2 +- sal/textenc/textenc.cxx | 2 +- 19 files changed, 75 insertions(+), 75 deletions(-) (limited to 'sal') diff --git a/sal/osl/all/compat.cxx b/sal/osl/all/compat.cxx index e562a853a951..dd47debea6ec 100644 --- a/sal/osl/all/compat.cxx +++ b/sal/osl/all/compat.cxx @@ -71,7 +71,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_sendResourcePipe(oslPipe, oslSocket) } namespace { -typedef void (SAL_CALL * pfunc_osl_printDebugMessage)(char const *); +typedef void (* pfunc_osl_printDebugMessage)(char const *); } SAL_DLLPUBLIC_EXPORT pfunc_osl_printDebugMessage SAL_CALL osl_setDebugMessageFunc(pfunc_osl_printDebugMessage) { @@ -79,7 +79,7 @@ osl_setDebugMessageFunc(pfunc_osl_printDebugMessage) { } namespace { -typedef void (SAL_CALL * pfunc_osl_printDetailedDebugMessage)( +typedef void (* pfunc_osl_printDetailedDebugMessage)( char const *, sal_Int32, char const *); } SAL_DLLPUBLIC_EXPORT pfunc_osl_printDetailedDebugMessage SAL_CALL diff --git a/sal/osl/all/filepath.cxx b/sal/osl/all/filepath.cxx index 1b2bcace133f..7e8022f4f9e8 100644 --- a/sal/osl/all/filepath.cxx +++ b/sal/osl/all/filepath.cxx @@ -20,7 +20,7 @@ #include #include -static sal_uInt32 SAL_CALL osl_defCalcTextWidth( rtl_uString *ustrText ) +static sal_uInt32 osl_defCalcTextWidth( rtl_uString *ustrText ) { return ustrText ? ustrText->length : 0; } diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx index d042e5349aef..a5b5dd985511 100644 --- a/sal/osl/unx/file_path_helper.cxx +++ b/sal/osl/unx/file_path_helper.cxx @@ -37,7 +37,7 @@ inline const rtl::OUString FPH_LOCAL_DIR_ENTRY() inline const rtl::OUString FPH_PARENT_DIR_ENTRY() { return rtl::OUString(".."); } -void SAL_CALL osl_systemPathRemoveSeparator(rtl_uString* pustrPath) +void osl_systemPathRemoveSeparator(rtl_uString* pustrPath) { OSL_PRECOND(nullptr != pustrPath, "osl_systemPathRemoveSeparator: Invalid parameter"); if (pustrPath != nullptr) @@ -57,7 +57,7 @@ void SAL_CALL osl_systemPathRemoveSeparator(rtl_uString* pustrPath) } } -void SAL_CALL osl_systemPathEnsureSeparator(rtl_uString** ppustrPath) +void osl_systemPathEnsureSeparator(rtl_uString** ppustrPath) { OSL_PRECOND((nullptr != ppustrPath) && (nullptr != *ppustrPath), "osl_systemPathEnsureSeparator: Invalid parameter"); if ((ppustrPath != nullptr) && (*ppustrPath != nullptr)) @@ -78,13 +78,13 @@ void SAL_CALL osl_systemPathEnsureSeparator(rtl_uString** ppustrPath) } } -bool SAL_CALL osl_systemPathIsRelativePath(const rtl_uString* pustrPath) +bool osl_systemPathIsRelativePath(const rtl_uString* pustrPath) { OSL_PRECOND(nullptr != pustrPath, "osl_systemPathIsRelativePath: Invalid parameter"); return ((pustrPath == nullptr) || (pustrPath->length == 0) || (pustrPath->buffer[0] != FPH_CHAR_PATH_SEPARATOR)); } -void SAL_CALL osl_systemPathMakeAbsolutePath( +void osl_systemPathMakeAbsolutePath( const rtl_uString* pustrBasePath, const rtl_uString* pustrRelPath, rtl_uString** ppustrAbsolutePath) @@ -101,7 +101,7 @@ void SAL_CALL osl_systemPathMakeAbsolutePath( *ppustrAbsolutePath = base.pData; } -void SAL_CALL osl_systemPathGetFileNameOrLastDirectoryPart( +void osl_systemPathGetFileNameOrLastDirectoryPart( const rtl_uString* pustrPath, rtl_uString** ppustrFileNameOrLastDirPart) { @@ -123,7 +123,7 @@ void SAL_CALL osl_systemPathGetFileNameOrLastDirectoryPart( rtl_uString_assign(ppustrFileNameOrLastDirPart, last_part.pData); } -bool SAL_CALL osl_systemPathIsHiddenFileOrDirectoryEntry( +bool osl_systemPathIsHiddenFileOrDirectoryEntry( const rtl_uString* pustrPath) { OSL_PRECOND(nullptr != pustrPath, "osl_systemPathIsHiddenFileOrDirectoryEntry: Invalid parameter"); @@ -138,7 +138,7 @@ bool SAL_CALL osl_systemPathIsHiddenFileOrDirectoryEntry( !osl_systemPathIsLocalOrParentDirectoryEntry(fdp.pData)); } -bool SAL_CALL osl_systemPathIsLocalOrParentDirectoryEntry( +bool osl_systemPathIsLocalOrParentDirectoryEntry( const rtl_uString* pustrPath) { OSL_PRECOND(pustrPath, "osl_systemPathIsLocalOrParentDirectoryEntry: Invalid parameter"); @@ -218,7 +218,7 @@ private: const sal_Unicode* m_path_segment_end; }; -bool SAL_CALL osl_searchPath( +bool osl_searchPath( const rtl_uString* pustrFilePath, const rtl_uString* pustrSearchPathList, rtl_uString** ppustrPathFound) diff --git a/sal/osl/unx/file_path_helper.hxx b/sal/osl/unx/file_path_helper.hxx index 5639ce72563e..86c10ccabcf5 100644 --- a/sal/osl/unx/file_path_helper.hxx +++ b/sal/osl/unx/file_path_helper.hxx @@ -36,7 +36,7 @@ @returns nothing */ -void SAL_CALL osl_systemPathRemoveSeparator(rtl_uString* pustrPath); +void osl_systemPathRemoveSeparator(rtl_uString* pustrPath); /** Adds a trailing path separator to the given system path if not already there @@ -50,7 +50,7 @@ void SAL_CALL osl_systemPathRemoveSeparator(rtl_uString* pustrPath); @returns nothing */ -void SAL_CALL osl_systemPathEnsureSeparator(rtl_uString** ppustrPath); +void osl_systemPathEnsureSeparator(rtl_uString** ppustrPath); /** Returns true if the given path is a relative path and so starts not with '/' @@ -61,7 +61,7 @@ void SAL_CALL osl_systemPathEnsureSeparator(rtl_uString** ppustrPath); @retval sal_False the given path starts with a separator */ -bool SAL_CALL osl_systemPathIsRelativePath( +bool osl_systemPathIsRelativePath( const rtl_uString* pustrPath); /** @@ -83,7 +83,7 @@ bool SAL_CALL osl_systemPathIsRelativePath( NULL and *ppustrAbsolutePath must be 0 or point to a valid rtl_uString */ -void SAL_CALL osl_systemPathMakeAbsolutePath( +void osl_systemPathMakeAbsolutePath( const rtl_uString* pustrBasePath, const rtl_uString* pustrRelPath, rtl_uString** ppustrAbsolutePath); @@ -103,7 +103,7 @@ void SAL_CALL osl_systemPathMakeAbsolutePath( @returns nothing */ -void SAL_CALL osl_systemPathGetFileNameOrLastDirectoryPart( +void osl_systemPathGetFileNameOrLastDirectoryPart( const rtl_uString* pustrPath, rtl_uString** ppustrFileNameOrLastDirPart); @@ -115,7 +115,7 @@ void SAL_CALL osl_systemPathGetFileNameOrLastDirectoryPart( alone or doesn't start with a dot */ -bool SAL_CALL osl_systemPathIsHiddenFileOrDirectoryEntry( +bool osl_systemPathIsHiddenFileOrDirectoryEntry( const rtl_uString* pustrPath); /************************************************ @@ -133,7 +133,7 @@ bool SAL_CALL osl_systemPathIsHiddenFileOrDirectoryEntry( ************************************************/ -bool SAL_CALL osl_systemPathIsLocalOrParentDirectoryEntry( +bool osl_systemPathIsLocalOrParentDirectoryEntry( const rtl_uString* pustrPath); /************************************************ @@ -159,7 +159,7 @@ bool SAL_CALL osl_systemPathIsLocalOrParentDirectoryEntry( directory was found else sal_False ***********************************************/ -bool SAL_CALL osl_searchPath( +bool osl_searchPath( const rtl_uString* pustrFilePath, const rtl_uString* pustrSearchPathList, rtl_uString** ppustrPathFound); diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx index e577e89608ba..f4eca10fbd08 100644 --- a/sal/osl/unx/pipe.cxx +++ b/sal/osl/unx/pipe.cxx @@ -39,7 +39,7 @@ #define PIPENAMEMASK "OSL_PIPE_%s" #define SECPIPENAMEMASK "OSL_PIPE_%s_%s" -oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions Options, oslSecurity Security); +oslPipe osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions Options, oslSecurity Security); static struct { @@ -158,7 +158,7 @@ cpyBootstrapSocketPath(sal_Char *name, size_t len) return bRet; } -oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions Options, +oslPipe osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions Options, oslSecurity Security) { int Flags; diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx index 8f5578567d37..f65eb831c910 100644 --- a/sal/osl/unx/process.cxx +++ b/sal/osl/unx/process.cxx @@ -96,7 +96,7 @@ static oslMutex ChildListMutex; } //Anonymous namespace -oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName, +oslProcessError osl_psz_executeProcess(sal_Char *pszImageName, sal_Char *pszArguments[], oslProcessOption Options, oslSecurity Security, @@ -565,7 +565,7 @@ oslProcessError SAL_CALL osl_executeProcess( ); } -oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName, +oslProcessError osl_psz_executeProcess(sal_Char *pszImageName, sal_Char *pszArguments[], oslProcessOption Options, oslSecurity Security, diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx index 494972b282fd..d4fd8b1d2aca 100644 --- a/sal/osl/unx/process_impl.cxx +++ b/sal/osl/unx/process_impl.cxx @@ -90,7 +90,7 @@ oslProcessError SAL_CALL bootstrap_getExecutableFile(rtl_uString ** ppFileURL) namespace { -oslProcessError SAL_CALL bootstrap_getExecutableFile(rtl_uString ** ppFileURL) +oslProcessError bootstrap_getExecutableFile(rtl_uString ** ppFileURL) { oslProcessError result = osl_Process_E_NotFound; diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx index a3d029e94da2..fa44ea934e5f 100644 --- a/sal/osl/unx/profile.cxx +++ b/sal/osl/unx/profile.cxx @@ -130,7 +130,7 @@ static bool writeProfileImpl (osl_TFile* pFile); static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl*); static bool osl_ProfileSwapProfileNames(osl_TProfileImpl*); static void osl_ProfileGenerateExtension(const sal_Char* pszFileName, const sal_Char* pszExtension, sal_Char* pszTmpName, int BufferMaxLen); -static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, oslProfileOption Flags); +static oslProfile osl_psz_openProfile(const sal_Char *pszProfileName, oslProfileOption Flags); oslProfile SAL_CALL osl_openProfile(rtl_uString *ustrProfileName, oslProfileOption Options) { @@ -144,7 +144,7 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *ustrProfileName, oslProfileOpti : nullptr; } -static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, oslProfileOption Flags) +static oslProfile osl_psz_openProfile(const sal_Char *pszProfileName, oslProfileOption Flags) { osl_TFile* pFile; osl_TProfileImpl* pProfile; diff --git a/sal/osl/unx/secimpl.hxx b/sal/osl/unx/secimpl.hxx index 3d3e2938657d..fda1c421c5db 100644 --- a/sal/osl/unx/secimpl.hxx +++ b/sal/osl/unx/secimpl.hxx @@ -27,7 +27,7 @@ struct oslSecurityImpl { char m_buffer[1]; /* should be a C99 flexible array member */ }; -bool SAL_CALL osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 nMax); +bool osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 nMax); #endif diff --git a/sal/osl/unx/security.cxx b/sal/osl/unx/security.cxx index 9370fe608cf9..d0d9ed7132b4 100644 --- a/sal/osl/unx/security.cxx +++ b/sal/osl/unx/security.cxx @@ -47,9 +47,9 @@ #define getpwuid_r(uid, pwd, buf, buflen, result) (*(result) = getpwuid(uid), (*(result) ? (memcpy (buf, *(result), sizeof (struct passwd)), 0) : errno)) #endif -static bool SAL_CALL osl_psz_getUserName(oslSecurity Security, sal_Char* pszName, sal_uInt32 nMax); -static bool SAL_CALL osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax); -static bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax); +static bool osl_psz_getUserName(oslSecurity Security, sal_Char* pszName, sal_uInt32 nMax); +static bool osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax); +static bool osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax); static bool sysconf_SC_GETPW_R_SIZE_MAX(std::size_t * value) { #if defined _SC_GETPW_R_SIZE_MAX @@ -169,7 +169,7 @@ sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **ustrIdent return bRet; } -bool SAL_CALL osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 nMax) +bool osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 nMax) { sal_Char buffer[32]; sal_Int32 nChr; @@ -208,7 +208,7 @@ sal_Bool SAL_CALL osl_getShortUserName(oslSecurity Security, rtl_uString **ustrN return osl_getUserName(Security, ustrName); // No domain name on unix } -static bool SAL_CALL osl_psz_getUserName(oslSecurity Security, sal_Char* pszName, sal_uInt32 nMax) +static bool osl_psz_getUserName(oslSecurity Security, sal_Char* pszName, sal_uInt32 nMax) { oslSecurityImpl *pSecImpl = static_cast(Security); @@ -239,7 +239,7 @@ sal_Bool SAL_CALL osl_getHomeDir(oslSecurity Security, rtl_uString **pustrDirect return bRet; } -static bool SAL_CALL osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax) +static bool osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax) { oslSecurityImpl *pSecImpl = static_cast(Security); @@ -351,7 +351,7 @@ sal_Bool SAL_CALL osl_getConfigDir(oslSecurity Security, rtl_uString **pustrDire #define DOT_CONFIG "/.config" -static bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax) +static bool osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax) { sal_Char *pStr = getenv("XDG_CONFIG_HOME"); diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx index 3633ee5bfd6c..7f2a6a43a2ae 100644 --- a/sal/osl/unx/socket.cxx +++ b/sal/osl/unx/socket.cxx @@ -251,34 +251,34 @@ static oslSocketError osl_SocketErrorFromNative(int nativeType) #define ERROR_FROM_NATIVE(y) osl_SocketErrorFromNative(y) -oslSocketAddr SAL_CALL osl_psz_createInetSocketAddr ( +oslSocketAddr osl_psz_createInetSocketAddr ( const sal_Char* pszDottedAddr, sal_Int32 Port); -oslHostAddr SAL_CALL osl_psz_createHostAddr ( +oslHostAddr osl_psz_createHostAddr ( const sal_Char *pszHostname, const oslSocketAddr Addr); -oslHostAddr SAL_CALL osl_psz_createHostAddrByName ( +oslHostAddr osl_psz_createHostAddrByName ( const sal_Char *pszHostname); -const sal_Char* SAL_CALL osl_psz_getHostnameOfHostAddr ( +const sal_Char* osl_psz_getHostnameOfHostAddr ( const oslHostAddr Addr); -oslSocketResult SAL_CALL osl_psz_getLocalHostname ( +oslSocketResult osl_psz_getLocalHostname ( sal_Char *pBuffer, sal_uInt32 nBufLen); -oslSocketAddr SAL_CALL osl_psz_resolveHostname ( +oslSocketAddr osl_psz_resolveHostname ( const sal_Char* pszHostname); -sal_Int32 SAL_CALL osl_psz_getServicePort ( +sal_Int32 osl_psz_getServicePort ( const sal_Char* pszServicename, const sal_Char* pszProtocol); -oslSocketResult SAL_CALL osl_psz_getHostnameOfSocketAddr ( +oslSocketResult osl_psz_getHostnameOfSocketAddr ( oslSocketAddr Addr, sal_Char *pBuffer, sal_uInt32 BufferSize); -oslSocketResult SAL_CALL osl_psz_getDottedInetAddrOfSocketAddr ( +oslSocketResult osl_psz_getDottedInetAddrOfSocketAddr ( oslSocketAddr Addr, sal_Char *pBuffer, sal_uInt32 BufferSize); -void SAL_CALL osl_psz_getLastSocketErrorDescription ( +void osl_psz_getLastSocketErrorDescription ( oslSocket Socket, sal_Char* pBuffer, sal_uInt32 BufferSize); static oslSocket createSocketImpl(int Socket) @@ -498,7 +498,7 @@ oslSocketAddr SAL_CALL osl_createInetSocketAddr ( return Addr; } -oslSocketAddr SAL_CALL osl_psz_createInetSocketAddr ( +oslSocketAddr osl_psz_createInetSocketAddr ( const sal_Char* pszDottedAddr, sal_Int32 Port) { @@ -706,7 +706,7 @@ oslHostAddr SAL_CALL osl_createHostAddr ( return HostAddr; } -oslHostAddr SAL_CALL osl_psz_createHostAddr ( +oslHostAddr osl_psz_createHostAddr ( const sal_Char *pszHostname, const oslSocketAddr pAddr) { @@ -763,7 +763,7 @@ oslHostAddr SAL_CALL osl_createHostAddrByName(rtl_uString *ustrHostname) return HostAddr; } -oslHostAddr SAL_CALL osl_psz_createHostAddrByName (const sal_Char *pszHostname) +oslHostAddr osl_psz_createHostAddrByName (const sal_Char *pszHostname) { struct hostent aHe; struct hostent *pHe; @@ -850,7 +850,7 @@ void SAL_CALL osl_getHostnameOfHostAddr ( rtl_uString_newFromAscii (ustrHostname, pHostname); } -const sal_Char* SAL_CALL osl_psz_getHostnameOfHostAddr (const oslHostAddr pAddr) +const sal_Char* osl_psz_getHostnameOfHostAddr (const oslHostAddr pAddr) { if (pAddr) return pAddr->pHostName; @@ -892,7 +892,7 @@ oslSocketResult SAL_CALL osl_getLocalHostname(rtl_uString **ustrLocalHostname) return Result; } -oslSocketResult SAL_CALL osl_psz_getLocalHostname ( +oslSocketResult osl_psz_getLocalHostname ( sal_Char *pBuffer, sal_uInt32 nBufLen) { static sal_Char LocalHostname[256] = ""; @@ -971,7 +971,7 @@ oslSocketAddr SAL_CALL osl_resolveHostname(rtl_uString *ustrHostname) return Addr; } -oslSocketAddr SAL_CALL osl_psz_resolveHostname(const sal_Char* pszHostname) +oslSocketAddr osl_psz_resolveHostname(const sal_Char* pszHostname) { struct oslHostAddrImpl *pAddr = osl_psz_createHostAddrByName(pszHostname); @@ -1030,7 +1030,7 @@ sal_Int32 SAL_CALL osl_getServicePort(rtl_uString *ustrServicename, rtl_uString return nPort; } -sal_Int32 SAL_CALL osl_psz_getServicePort(const sal_Char* pszServicename, +sal_Int32 osl_psz_getServicePort(const sal_Char* pszServicename, const sal_Char* pszProtocol) { struct servent* ps; @@ -1105,7 +1105,7 @@ oslSocketResult SAL_CALL osl_getHostnameOfSocketAddr(oslSocketAddr Addr, rtl_uSt return Result; } -oslSocketResult SAL_CALL osl_psz_getHostnameOfSocketAddr(oslSocketAddr pAddr, +oslSocketResult osl_psz_getHostnameOfSocketAddr(oslSocketAddr pAddr, sal_Char *pBuffer, sal_uInt32 BufferSize) { oslHostAddr pHostAddr= osl_createHostAddrByAddr(pAddr); @@ -1138,7 +1138,7 @@ oslSocketResult SAL_CALL osl_getDottedInetAddrOfSocketAddr(oslSocketAddr Addr, r } -oslSocketResult SAL_CALL osl_psz_getDottedInetAddrOfSocketAddr(oslSocketAddr pAddr, +oslSocketResult osl_psz_getDottedInetAddrOfSocketAddr(oslSocketAddr pAddr, sal_Char *pBuffer, sal_uInt32 BufferSize) { SAL_WARN_IF( !pAddr, "sal.osl", "undefined address" ); @@ -2146,7 +2146,7 @@ void SAL_CALL osl_getLastSocketErrorDescription(oslSocket Socket, rtl_uString ** rtl_uString_newFromAscii(ustrError,pszError); } -void SAL_CALL osl_psz_getLastSocketErrorDescription(oslSocket pSocket, sal_Char* pBuffer, sal_uInt32 BufferSize) +void osl_psz_getLastSocketErrorDescription(oslSocket pSocket, sal_Char* pBuffer, sal_uInt32 BufferSize) { /* make sure pBuffer will be a zero-terminated string even when strncpy has to cut */ pBuffer[BufferSize-1]= '\0'; diff --git a/sal/qa/osl/module/osl_Module_DLL.cxx b/sal/qa/osl/module/osl_Module_DLL.cxx index 0b22d7a3c4ad..b8d4885969cb 100644 --- a/sal/qa/osl/module/osl_Module_DLL.cxx +++ b/sal/qa/osl/module/osl_Module_DLL.cxx @@ -27,7 +27,7 @@ // But we instantiate a test plugin to fake the build process. CPPUNIT_PLUGIN_IMPLEMENT(); -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL firstfunc( sal_Bool ) +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool firstfunc( sal_Bool ) { return true; } diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx index c6c016afb7e4..ae23a9ef41a0 100644 --- a/sal/qa/osl/process/osl_Thread.cxx +++ b/sal/qa/osl/process/osl_Thread.cxx @@ -1696,7 +1696,7 @@ namespace osl_Thread } // namespace osl_Thread // destroy function when the binding thread terminate -void SAL_CALL destroyCallback(void * data) +void destroyCallback(void * data) { delete[] static_cast(data); } 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, diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx index 322a7c2b672e..ded8815a4e97 100644 --- a/sal/textenc/textenc.cxx +++ b/sal/textenc/textenc.cxx @@ -374,7 +374,7 @@ extern "C" { typedef ImplTextEncodingData const * TextEncodingFunction(rtl_TextEncoding); -void SAL_CALL thisModule() {} +void thisModule() {} }; -- cgit