[Libreoffice-commits] core.git: sal/osl sal/rtl

Julien Nabet serval2412 at yahoo.fr
Fri Feb 8 13:53:58 PST 2013


 sal/osl/unx/file_misc.cxx      |    4 +---
 sal/rtl/source/alloc_cache.cxx |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 8c27bd9b14715c05d66eaa5e0ef10a6c926c8c1f
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Feb 8 22:26:44 2013 +0100

    Some cppcheck cleaning
    
    Change-Id: I1dc8415569f7133d57c495e47f038e98d50d64d7

diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 3fd2119..b91d803 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 a64bd42..745c0a8 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));
 


More information about the Libreoffice-commits mailing list