Kaydet (Commit) 9dfd9f1a authored tarafından Chris Sherlock's avatar Chris Sherlock Kaydeden (comit) Noel Grandin

osl: w32/file.cxx cleanup signatures of definitions

Change-Id: Ic704e71258c5b8a3dc018862afd1aab1bdb5ab84
Reviewed-on: https://gerrit.libreoffice.org/39146Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst f18f7b28
...@@ -154,8 +154,7 @@ struct FileHandle_Impl ...@@ -154,8 +154,7 @@ struct FileHandle_Impl
}; };
}; };
FileHandle_Impl::Allocator & FileHandle_Impl::Allocator& FileHandle_Impl::Allocator::get()
FileHandle_Impl::Allocator::get()
{ {
static Allocator g_aBufferAllocator; static Allocator g_aBufferAllocator;
return g_aBufferAllocator; return g_aBufferAllocator;
...@@ -198,6 +197,7 @@ FileHandle_Impl::Guard::Guard(LPCRITICAL_SECTION pMutex) ...@@ -198,6 +197,7 @@ FileHandle_Impl::Guard::Guard(LPCRITICAL_SECTION pMutex)
OSL_PRECOND (m_mutex != nullptr, "FileHandle_Impl::Guard::Guard(): null pointer."); OSL_PRECOND (m_mutex != nullptr, "FileHandle_Impl::Guard::Guard(): null pointer.");
::EnterCriticalSection (m_mutex); ::EnterCriticalSection (m_mutex);
} }
FileHandle_Impl::Guard::~Guard() FileHandle_Impl::Guard::~Guard()
{ {
OSL_PRECOND (m_mutex != nullptr, "FileHandle_Impl::Guard::~Guard(): null pointer."); OSL_PRECOND (m_mutex != nullptr, "FileHandle_Impl::Guard::~Guard(): null pointer.");
...@@ -664,8 +664,7 @@ oslFileError FileHandle_Impl::syncFile() ...@@ -664,8 +664,7 @@ oslFileError FileHandle_Impl::syncFile()
return result; return result;
} }
extern "C" oslFileHandle extern "C" oslFileHandle SAL_CALL osl_createFileHandleFromOSHandle(
SAL_CALL osl_createFileHandleFromOSHandle(
HANDLE hFile, HANDLE hFile,
sal_uInt32 uFlags) sal_uInt32 uFlags)
{ {
...@@ -698,8 +697,7 @@ SAL_CALL osl_createFileHandleFromOSHandle( ...@@ -698,8 +697,7 @@ SAL_CALL osl_createFileHandleFromOSHandle(
return static_cast<oslFileHandle>(pImpl); return static_cast<oslFileHandle>(pImpl);
} }
oslFileError oslFileError SAL_CALL osl_openFile(
SAL_CALL osl_openFile(
rtl_uString * strPath, rtl_uString * strPath,
oslFileHandle * pHandle, oslFileHandle * pHandle,
sal_uInt32 uFlags) sal_uInt32 uFlags)
...@@ -738,8 +736,7 @@ SAL_CALL osl_openFile( ...@@ -738,8 +736,7 @@ SAL_CALL osl_openFile(
return result; return result;
} }
oslFileError oslFileError SAL_CALL osl_syncFile(oslFileHandle Handle)
SAL_CALL osl_syncFile(oslFileHandle Handle)
{ {
FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle); FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
if ((!pImpl) || !IsValidHandle(pImpl->m_hFile)) if ((!pImpl) || !IsValidHandle(pImpl->m_hFile))
...@@ -757,8 +754,7 @@ SAL_CALL osl_syncFile(oslFileHandle Handle) ...@@ -757,8 +754,7 @@ SAL_CALL osl_syncFile(oslFileHandle Handle)
return osl_File_E_None; return osl_File_E_None;
} }
oslFileError oslFileError SAL_CALL osl_closeFile(oslFileHandle Handle)
SAL_CALL osl_closeFile(oslFileHandle Handle)
{ {
FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle); FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
if ((!pImpl) || !IsValidHandle(pImpl->m_hFile)) if ((!pImpl) || !IsValidHandle(pImpl->m_hFile))
...@@ -783,8 +779,7 @@ SAL_CALL osl_closeFile(oslFileHandle Handle) ...@@ -783,8 +779,7 @@ SAL_CALL osl_closeFile(oslFileHandle Handle)
return result; return result;
} }
oslFileError oslFileError SAL_CALL osl_mapFile(
SAL_CALL osl_mapFile(
oslFileHandle Handle, oslFileHandle Handle,
void** ppAddr, void** ppAddr,
sal_uInt64 uLength, sal_uInt64 uLength,
...@@ -855,8 +850,7 @@ SAL_CALL osl_mapFile( ...@@ -855,8 +850,7 @@ SAL_CALL osl_mapFile(
return osl_File_E_None; return osl_File_E_None;
} }
oslFileError oslFileError SAL_CALL osl_unmapFile(void* pAddr, sal_uInt64 /* uLength */)
SAL_CALL osl_unmapFile(void* pAddr, sal_uInt64 /* uLength */)
{ {
if (!pAddr) if (!pAddr)
return osl_File_E_INVAL; return osl_File_E_INVAL;
...@@ -867,8 +861,7 @@ SAL_CALL osl_unmapFile(void* pAddr, sal_uInt64 /* uLength */) ...@@ -867,8 +861,7 @@ SAL_CALL osl_unmapFile(void* pAddr, sal_uInt64 /* uLength */)
return osl_File_E_None; return osl_File_E_None;
} }
oslFileError oslFileError SAL_CALL osl_unmapMappedFile(oslFileHandle /* Handle */, void* pAddr, sal_uInt64 uLength)
SAL_CALL osl_unmapMappedFile(oslFileHandle /* Handle */, void* pAddr, sal_uInt64 uLength)
{ {
return osl_unmapFile(pAddr, uLength); return osl_unmapFile(pAddr, uLength);
} }
...@@ -892,8 +885,7 @@ SAL_CALL osl_readLine( ...@@ -892,8 +885,7 @@ SAL_CALL osl_readLine(
return result; return result;
} }
oslFileError oslFileError SAL_CALL osl_readFile(
SAL_CALL osl_readFile(
oslFileHandle Handle, oslFileHandle Handle,
void * pBuffer, void * pBuffer,
sal_uInt64 uBytesRequested, sal_uInt64 uBytesRequested,
...@@ -912,8 +904,7 @@ SAL_CALL osl_readFile( ...@@ -912,8 +904,7 @@ SAL_CALL osl_readFile(
return result; return result;
} }
oslFileError oslFileError SAL_CALL osl_writeFile(
SAL_CALL osl_writeFile(
oslFileHandle Handle, oslFileHandle Handle,
const void * pBuffer, const void * pBuffer,
sal_uInt64 uBytesToWrite, sal_uInt64 uBytesToWrite,
...@@ -933,8 +924,7 @@ SAL_CALL osl_writeFile( ...@@ -933,8 +924,7 @@ SAL_CALL osl_writeFile(
return result; return result;
} }
oslFileError oslFileError SAL_CALL osl_readFileAt(
SAL_CALL osl_readFileAt(
oslFileHandle Handle, oslFileHandle Handle,
sal_uInt64 uOffset, sal_uInt64 uOffset,
void* pBuffer, void* pBuffer,
...@@ -958,8 +948,7 @@ SAL_CALL osl_readFileAt( ...@@ -958,8 +948,7 @@ SAL_CALL osl_readFileAt(
return pImpl->readFileAt(nOffset, pBuffer, uBytesRequested, pBytesRead); return pImpl->readFileAt(nOffset, pBuffer, uBytesRequested, pBytesRead);
} }
oslFileError oslFileError SAL_CALL osl_writeFileAt(
SAL_CALL osl_writeFileAt(
oslFileHandle Handle, oslFileHandle Handle,
sal_uInt64 uOffset, sal_uInt64 uOffset,
const void* pBuffer, const void* pBuffer,
...@@ -983,8 +972,7 @@ SAL_CALL osl_writeFileAt( ...@@ -983,8 +972,7 @@ SAL_CALL osl_writeFileAt(
return pImpl->writeFileAt(nOffset, pBuffer, uBytesToWrite, pBytesWritten); return pImpl->writeFileAt(nOffset, pBuffer, uBytesToWrite, pBytesWritten);
} }
oslFileError oslFileError SAL_CALL osl_isEndOfFile(oslFileHandle Handle, sal_Bool *pIsEOF)
SAL_CALL osl_isEndOfFile(oslFileHandle Handle, sal_Bool *pIsEOF)
{ {
FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle); FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
...@@ -996,8 +984,7 @@ SAL_CALL osl_isEndOfFile(oslFileHandle Handle, sal_Bool *pIsEOF) ...@@ -996,8 +984,7 @@ SAL_CALL osl_isEndOfFile(oslFileHandle Handle, sal_Bool *pIsEOF)
return osl_File_E_None; return osl_File_E_None;
} }
oslFileError oslFileError SAL_CALL osl_getFilePos(oslFileHandle Handle, sal_uInt64 *pPos)
SAL_CALL osl_getFilePos(oslFileHandle Handle, sal_uInt64 *pPos)
{ {
FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle); FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
if ((!pImpl) || !IsValidHandle(pImpl->m_hFile) || (!pPos)) if ((!pImpl) || !IsValidHandle(pImpl->m_hFile) || (!pPos))
...@@ -1008,8 +995,7 @@ SAL_CALL osl_getFilePos(oslFileHandle Handle, sal_uInt64 *pPos) ...@@ -1008,8 +995,7 @@ SAL_CALL osl_getFilePos(oslFileHandle Handle, sal_uInt64 *pPos)
return osl_File_E_None; return osl_File_E_None;
} }
oslFileError oslFileError SAL_CALL osl_setFilePos(oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uOffset)
SAL_CALL osl_setFilePos(oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uOffset)
{ {
FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle); FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
if ((!pImpl) || !IsValidHandle(pImpl->m_hFile)) if ((!pImpl) || !IsValidHandle(pImpl->m_hFile))
...@@ -1051,8 +1037,7 @@ SAL_CALL osl_setFilePos(oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uOffset ...@@ -1051,8 +1037,7 @@ SAL_CALL osl_setFilePos(oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uOffset
return pImpl->setPos(nPos + nOffset); return pImpl->setPos(nPos + nOffset);
} }
oslFileError oslFileError SAL_CALL osl_getFileSize(oslFileHandle Handle, sal_uInt64 *pSize)
SAL_CALL osl_getFileSize(oslFileHandle Handle, sal_uInt64 *pSize)
{ {
FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle); FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
...@@ -1064,8 +1049,7 @@ SAL_CALL osl_getFileSize(oslFileHandle Handle, sal_uInt64 *pSize) ...@@ -1064,8 +1049,7 @@ SAL_CALL osl_getFileSize(oslFileHandle Handle, sal_uInt64 *pSize)
return osl_File_E_None; return osl_File_E_None;
} }
oslFileError oslFileError SAL_CALL osl_setFileSize(oslFileHandle Handle, sal_uInt64 uSize)
SAL_CALL osl_setFileSize(oslFileHandle Handle, sal_uInt64 uSize)
{ {
FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle); FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment