[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [baloo] src/engine: fix missing m_env = nullptr assignment
From:       Christoph Cullmann <cullmann () kde ! org>
Date:       2016-09-11 18:42:35
Message-ID: E1bj9i7-0002u7-Ls () code ! kde ! org
[Download RAW message or body]

Git commit 988e5feb5de64ed25337fe2ff9b494eb30b15b47 by Christoph Cullmann.
Committed on 11/09/2016 at 18:39.
Pushed by cullmann into branch 'master'.

fix missing m_env = nullptr assignment
REVIEW: 128890

M  +11   -8    src/engine/database.cpp

http://commits.kde.org/baloo/988e5feb5de64ed25337fe2ff9b494eb30b15b47

diff --git a/src/engine/database.cpp b/src/engine/database.cpp
index 8ae6b03..6a433c7 100644
--- a/src/engine/database.cpp
+++ b/src/engine/database.cpp
@@ -59,6 +59,7 @@ Database::~Database()
     // try only to close if we did open the DB successfully
     if (m_env) {
         mdb_env_close(m_env);
+        m_env = nullptr;
     }
 }
 
@@ -97,7 +98,7 @@ bool Database::open(OpenMode mode)
 
     int rc = mdb_env_create(&m_env);
     if (rc) {
-        m_env = 0;
+        m_env = nullptr;
         return false;
     }
 
@@ -118,7 +119,7 @@ bool Database::open(OpenMode mode)
     QByteArray arr = QFile::encodeName(indexInfo.absoluteFilePath());
     rc = mdb_env_open(m_env, arr.constData(), MDB_NOSUBDIR | MDB_NOMEMINIT, 0664);
     if (rc) {
-        m_env = 0;
+        m_env = nullptr;
         return false;
     }
 
@@ -126,6 +127,7 @@ bool Database::open(OpenMode mode)
     Q_ASSERT_X(rc == 0, "Database::open reader_check", mdb_strerror(rc));
     if (rc) {
         mdb_env_close(m_env);
+        m_env = nullptr;
         return false;
     }
 
@@ -139,7 +141,7 @@ bool Database::open(OpenMode mode)
         if (rc) {
             mdb_txn_abort(txn);
             mdb_env_close(m_env);
-            m_env = 0;
+            m_env = nullptr;
             return false;
         }
 
@@ -165,7 +167,7 @@ bool Database::open(OpenMode mode)
         if (!m_dbis.isValid()) {
             mdb_txn_abort(txn);
             mdb_env_close(m_env);
-            m_env = 0;
+            m_env = nullptr;
             return false;
         }
 
@@ -173,7 +175,7 @@ bool Database::open(OpenMode mode)
         Q_ASSERT_X(rc == 0, "Database::transaction ro commit", mdb_strerror(rc));
         if (rc) {
             mdb_env_close(m_env);
-            m_env = 0;
+            m_env = nullptr;
             return false;
         }
     } else {
@@ -182,7 +184,7 @@ bool Database::open(OpenMode mode)
         if (rc) {
             mdb_txn_abort(txn);
             mdb_env_close(m_env);
-            m_env = 0;
+            m_env = nullptr;
             return false;
         }
 
@@ -208,7 +210,7 @@ bool Database::open(OpenMode mode)
         if (!m_dbis.isValid()) {
             mdb_txn_abort(txn);
             mdb_env_close(m_env);
-            m_env = 0;
+            m_env = nullptr;
             return false;
         }
 
@@ -216,11 +218,12 @@ bool Database::open(OpenMode mode)
         Q_ASSERT_X(rc == 0, "Database::transaction commit", mdb_strerror(rc));
         if (rc) {
             mdb_env_close(m_env);
-            m_env = 0;
+            m_env = nullptr;
             return false;
         }
     }
 
+    Q_ASSERT(m_env);
     return true;
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]