[Pkg-owncloud-commits] [owncloud-client] 125/211: SocketAPI: Properly release precompiled statements. Use sqlite3_close

[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 3fcb0d2d6b5c6fa32c47ec13dc8f54036a613bf0
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Mon Oct 20 10:50:57 2014 +0200

    SocketAPI: Properly release precompiled statements. Use sqlite3_close
    
    rather than its v2 equivalent. That should make it compile on older
    linux platforms.
---
 src/mirall/ownsql.cpp    | 2 +-
 src/mirall/socketapi.cpp | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/mirall/ownsql.cpp b/src/mirall/ownsql.cpp
index ac66c2c..075b682 100644
--- a/src/mirall/ownsql.cpp
+++ b/src/mirall/ownsql.cpp
@@ -66,7 +66,7 @@ QString SqlDatabase::error() const
 void SqlDatabase::close()
 {
     if( _db ) {
-        SQLITE_DO(sqlite3_close_v2(_db) );
+        SQLITE_DO(sqlite3_close(_db) );
         _db = 0;
     }
 }
diff --git a/src/mirall/socketapi.cpp b/src/mirall/socketapi.cpp
index 039dcf8..606f3db 100644
--- a/src/mirall/socketapi.cpp
+++ b/src/mirall/socketapi.cpp
@@ -226,9 +226,13 @@ void SocketApi::slotUnregisterPath( const QString& alias )
         broadcastMessage(QLatin1String("UNREGISTER_PATH"), f->path(), QString::null, true );
 
         if( _dbConnections.contains(f)) {
-            sqlite3_close_v2(_dbConnections[f]._db);
+            SqliteHandle h = _dbConnections[f];
+            if( h._stmt ) {
+                sqlite3_finalize(h._stmt);
+            }
+            sqlite3_close(h._db);
+            _dbConnections.remove(f);
         }
-        _dbConnections.remove(f);
     }
 }
 

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