Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean up SSQLite3::~SSQLite3 #13955

Merged
merged 1 commit into from Mar 21, 2024
Merged

Clean up SSQLite3::~SSQLite3 #13955

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions pdns/ssqlite3.cc
View file
Open in desktop
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