[Libreoffice-commits] core.git: 2 commits - idl/source setup_native/source

[Julien Nabet]

 idl/source/objects/module.cxx                    |    3 +--
 setup_native/source/win32/wintools/msidb/msidb.c |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 88be7d32f30b08da4399f6d67d8d494dcfcc34b5
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Tue Feb 12 16:31:21 2013 +0100

    Simplify this
    
    Change-Id: I341f4a74062e78f6a4d23ca24d635c6a95fb90cb

diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 43a6869..4b97510 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -319,8 +319,7 @@ sal_Bool SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm
 
     sal_uInt32  nTokPos = rInStm.Tell();
     SvToken * pTok  = rInStm.GetToken_Next();
-    sal_Bool bOk        = sal_False;
-    bOk = pTok->Is( SvHash_module() );
+    sal_Bool bOk = pTok->Is( SvHash_module() );
     if( bOk )
     {
         pTok = rInStm.GetToken_Next();
commit 6842be374c0175bd19759f03138e7b9ff40cd083
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Tue Feb 12 16:29:24 2013 +0100

    It's better to use fclose on a not null handle
    
    Change-Id: I609270e269a0905818d6a2b4f44cb9a034099346

diff --git a/setup_native/source/win32/wintools/msidb/msidb.c b/setup_native/source/win32/wintools/msidb/msidb.c
index c492ba2..2ad3347 100644
--- a/setup_native/source/win32/wintools/msidb/msidb.c
+++ b/setup_native/source/win32/wintools/msidb/msidb.c
@@ -146,8 +146,8 @@ static BOOL msidbExportStorage(LPCWSTR dbfile, LPCWSTR wdir, LPWSTR storageName)
     if (fp != NULL)
     {
         fwrite(dataBuffer, 1, dataLen, fp);
+        fclose(fp);
     }
-    fclose(fp);
 
     free(storagePath);
     MsiCloseHandle(rec);
@@ -262,8 +262,8 @@ static BOOL msidbExportStream(LPCWSTR dbfile, LPCWSTR wdir, LPCWSTR streamName)
     if (fp != NULL)
     {
         fwrite(dataBuffer, 1, dataLen, fp);
+        fclose(fp);
     }
-    fclose(fp);
 
     free(streamFileA);
     MsiCloseHandle(rec);