diff options
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/file_misc.cxx | 4 | ||||
| -rw-r--r-- | sal/rtl/source/alloc_cache.cxx | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx index 3fd211971fb0..b91d8030d770 100644 --- a/sal/osl/unx/file_misc.cxx +++ b/sal/osl/unx/file_misc.cxx @@ -731,9 +731,7 @@ oslFileError SAL_CALL osl_removeFile( rtl_uString* ustrFileURL ) static oslFileError oslDoMoveFile( const sal_Char* pszPath, const sal_Char* pszDestPath) { - oslFileError tErr=osl_File_E_invalidError; - - tErr = osl_psz_moveFile(pszPath,pszDestPath); + oslFileError tErr = osl_psz_moveFile(pszPath,pszDestPath); if ( tErr == osl_File_E_None ) { return tErr; diff --git a/sal/rtl/source/alloc_cache.cxx b/sal/rtl/source/alloc_cache.cxx index a64bd4244af5..745c0a8e2348 100644 --- a/sal/rtl/source/alloc_cache.cxx +++ b/sal/rtl/source/alloc_cache.cxx @@ -937,11 +937,9 @@ rtl_cache_deactivate ( rtl_cache_type * cache ) { - int active = 1; - /* remove from cache list */ RTL_MEMORY_LOCK_ACQUIRE(&(g_cache_list.m_lock)); - active = QUEUE_STARTED_NAMED(cache, cache_) == 0; + int active = QUEUE_STARTED_NAMED(cache, cache_) == 0; QUEUE_REMOVE_NAMED(cache, cache_); RTL_MEMORY_LOCK_RELEASE(&(g_cache_list.m_lock)); |