diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2004-12-23 10:31:59 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2004-12-23 10:31:59 +0000 |
| commit | 18a6c0b56a003cd882e082f8d5f74ebf7a3e5608 (patch) | |
| tree | 25705e2a7fef5e2f7886755f4b7f366e9f413938 /store | |
| parent | e7f7d511a3ad39faef431bdfc2a79fa090d0b5f7 (diff) | |
INTEGRATION: CWS mhu05 (1.12.74); FILE MERGED
2004/12/09 18:03:24 mhu 1.12.74.1: #i38646# Disabled internal commit (sync) to disk (STORE_FEATURE_COMMIT). Improved propagation of errors from fsync() and close() calls.
Diffstat (limited to 'store')
| -rw-r--r-- | store/source/filelckb.cxx | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/store/source/filelckb.cxx b/store/source/filelckb.cxx index 67455f86d911..d5f3834014de 100644 --- a/store/source/filelckb.cxx +++ b/store/source/filelckb.cxx @@ -2,9 +2,9 @@ * * $RCSfile: filelckb.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: vg $ $Date: 2003-04-15 17:34:36 $ + * last change: $Author: vg $ $Date: 2004-12-23 11:31:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -417,7 +417,7 @@ inline OFileLockBytes_Impl::~OFileLockBytes_Impl (void) m_aMemmap.cleanup(); if (m_hFile) { - __store_fclose (m_hFile); + (void)__store_fclose (m_hFile); m_hFile = 0; } } @@ -430,7 +430,7 @@ inline storeError OFileLockBytes_Impl::close (void) m_aMemmap.cleanup(); if (m_hFile) { - __store_fclose (m_hFile); + (void)__store_fclose (m_hFile); m_hFile = 0; } return store_E_None; @@ -445,7 +445,7 @@ inline storeError OFileLockBytes_Impl::create ( m_aMemmap.cleanup(); if (m_hFile) { - __store_fclose (m_hFile); + (void)__store_fclose (m_hFile); m_hFile = 0; } @@ -578,11 +578,9 @@ inline storeError OFileLockBytes_Impl::resize (sal_uInt32 nSize) inline storeError OFileLockBytes_Impl::sync (void) { if (m_bWriteable) - { - // File I/O. - __store_fsync (m_hFile); - } - return store_E_None; + return __store_fsync (m_hFile); + else + return store_E_None; } /* @@ -738,7 +736,7 @@ storeError OFileLockBytes::stat (sal_uInt32 &rnSize) * lockRange. */ storeError OFileLockBytes::lockRange ( - sal_uInt32 nOffset, sal_uInt32 nBytes) + sal_uInt32 /* nOffset */, sal_uInt32 /* nBytes */) { // Acquire exclusive access. osl::MutexGuard aGuard (m_aMutex); @@ -752,7 +750,7 @@ storeError OFileLockBytes::lockRange ( * unlockRange. */ storeError OFileLockBytes::unlockRange ( - sal_uInt32 nOffset, sal_uInt32 nBytes) + sal_uInt32 /* nOffset */, sal_uInt32 /* nBytes */) { // Acquire exclusive access. osl::MutexGuard aGuard (m_aMutex); |