[Libreoffice-commits] .: 2 commits - sal/osl

[Caolán McNamara]

 sal/osl/w32/file_dirvol.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e118630f22521356c405e29c13b5d7300da1b24f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 13 11:01:16 2011 +0100

    reduce the scope a bit further

diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index e5852eb..8e3ea7f 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -76,10 +76,9 @@ extern "C" BOOL TimeValueToFileTime(const TimeValue *cpTimeVal, FILETIME *pFTime
 
     if ( SystemTimeToFileTime(&BaseSysTime, &BaseFileTime) )
     {
-        __int64 localTime;
         __int64 timeValue;
 
-        localTime=cpTimeVal->Seconds*(__int64)10000000+cpTimeVal->Nanosec/100;
+        __int64 localTime = cpTimeVal->Seconds*(__int64)10000000+cpTimeVal->Nanosec/100;
         *(__int64 *)&FTime=localTime;
         fSuccess = 0 <= (timeValue= *((__int64 *)&BaseFileTime) + *((__int64 *) &FTime));
         if (fSuccess)
commit 935c7c0714ce2e5799292d193a2be0e175d1d80c
Author: Andreu Correa Casablanca <castarco at gmail.com>
Date:   Sun Sep 11 22:01:10 2011 +0200

    Reduced the scope of a variable in core/sal/osl/w32/file_dirvol.cxx

diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index b6dc002..e5852eb 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -60,7 +60,6 @@ extern "C" BOOL TimeValueToFileTime(const TimeValue *cpTimeVal, FILETIME *pFTime
     SYSTEMTIME  BaseSysTime;
     FILETIME    BaseFileTime;
     FILETIME    FTime;
-    __int64     localTime;
     BOOL        fSuccess = FALSE;
 
     BaseSysTime.wYear         = 1970;
@@ -77,7 +76,9 @@ extern "C" BOOL TimeValueToFileTime(const TimeValue *cpTimeVal, FILETIME *pFTime
 
     if ( SystemTimeToFileTime(&BaseSysTime, &BaseFileTime) )
     {
+        __int64 localTime;
         __int64 timeValue;
+
         localTime=cpTimeVal->Seconds*(__int64)10000000+cpTimeVal->Nanosec/100;
         *(__int64 *)&FTime=localTime;
         fSuccess = 0 <= (timeValue= *((__int64 *)&BaseFileTime) + *((__int64 *) &FTime));