Skip to content

Commit

Permalink
Clean up SSQLite3::~SSQLite3
Browse files Browse the repository at this point in the history
* The loop will run once or twice
* There used to be some cleanup that was done in the failure case but it has been gone for a while
* Clarify logic
* Report error message from sqlite3
  • Loading branch information
jsoref committed Mar 19, 2024
1 parent f21dbba commit 11840d2
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions pdns/ssqlite3.cc
Expand Up @@ -319,17 +319,17 @@ void SSQLite3::setLog(bool state)
// Destructor.
SSQLite3::~SSQLite3()
{
for (int tries = 0;; ++tries) {
for (int tried = 0;; ++tried) {
int ret = sqlite3_close(m_pDB);
if (ret != SQLITE_OK) {
if (tries != 0 || ret != SQLITE_BUSY) { // if we have SQLITE_BUSY, and a working m_Pstmt, try finalize
cerr << "Unable to close down sqlite connection: " << ret << endl;
abort();
}
}
else {
if (ret == SQLITE_OK) {
break;
}
cerr << "SQLite3 error state while tearing down database: " << SSQLite3ErrorString(m_pDB) << endl;
if (tried == 0 && ret == SQLITE_BUSY) {
continue;
}
cerr << "Unable to close down sqlite connection: " << ret << endl;
abort();
}
}

Expand Down

0 comments on commit 11840d2

Please sign in to comment.