[Pkg-owncloud-commits] [owncloud-client] 09/26: Add missing call to CloseHandle on the win32 platform.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit ecf45856e1831af0d658a8d031b0ac6fca04873a
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Tue Dec 3 10:06:53 2013 +0100

    Add missing call to CloseHandle on the win32 platform.
    
    This fixes bug mirall#1236 and also mirall#1237
    Also some minor cleanups.
---
 VERSION.cmake                        |  2 +-
 src/mirall/syncjournalfilerecord.cpp | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/VERSION.cmake b/VERSION.cmake
index a73f783..6f3ed48 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,6 +1,6 @@
 set( VERSION_MAJOR 1 )
 set( VERSION_MINOR 5 )
 set( VERSION_PATCH 0 )
-set( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}beta1")
+set( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}beta2")
 set( SOVERSION 0 )
 
diff --git a/src/mirall/syncjournalfilerecord.cpp b/src/mirall/syncjournalfilerecord.cpp
index 8607400..6fd4ea1 100644
--- a/src/mirall/syncjournalfilerecord.cpp
+++ b/src/mirall/syncjournalfilerecord.cpp
@@ -49,12 +49,9 @@ SyncJournalFileRecord::SyncJournalFileRecord(const SyncFileItem &item, const QSt
     HANDLE h = CreateFileW( (wchar_t*)localFileName.utf16(), 0, FILE_SHARE_READ, NULL, OPEN_EXISTING,
                      FILE_ATTRIBUTE_NORMAL+FILE_FLAG_BACKUP_SEMANTICS, NULL );
     if( h == INVALID_HANDLE_VALUE ) {
-        _inode = qrand();
+        _inode = 0;
         qWarning() << "Failed to query the 'inode' because CreateFileW failed for file " << localFileName;
     } else {
-        FILETIME ftCreate, ftAccess, ftWrite;
-        //     SYSTEMTIME stUTC;
-
         BY_HANDLE_FILE_INFORMATION fileInfo;
 
         if( GetFileInformationByHandle( h, &fileInfo ) ) {
@@ -68,14 +65,15 @@ SyncJournalFileRecord::SyncJournalFileRecord(const SyncFileItem &item, const QSt
             _inode = FileIndex.QuadPart;
         } else {
             qWarning() << "Failed to query the 'inode' for file " << localFileName;
-            _inode = qrand();
+            _inode = 0;
         }
+        CloseHandle(h);
     }
 #else
     struct stat sb;
     if( stat(QFile::encodeName(localFileName).constData(), &sb) < 0) {
         qWarning() << "Failed to query the 'inode' for file " << localFileName;
-        _inode = qrand();
+        _inode = 0;
     } else {
         _inode = sb.st_ino;
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git