@@ -438,7 +438,7 @@ bool DBBrowserDB::tryEncryptionSettings(const QString& filePath, bool* encrypted
438
438
if (err == SQLITE_BUSY || err == SQLITE_PERM || err == SQLITE_NOMEM || err == SQLITE_IOERR || err == SQLITE_CORRUPT || err == SQLITE_CANTOPEN)
439
439
{
440
440
lastErrorMessage = QString::fromUtf8 (sqlite3_errmsg (dbHandle));
441
- sqlite3_close (dbHandle);
441
+ sqlite3_close_v2 (dbHandle);
442
442
return false ;
443
443
}
444
444
@@ -498,14 +498,14 @@ bool DBBrowserDB::tryEncryptionSettings(const QString& filePath, bool* encrypted
498
498
{
499
499
*cipherSettings = cipherDialog->getCipherSettings ();
500
500
} else {
501
- sqlite3_close (dbHandle);
501
+ sqlite3_close_v2 (dbHandle);
502
502
*encrypted = false ;
503
503
return false ;
504
504
}
505
505
}
506
506
507
507
// Close and reopen database first to be in a clean state after the failed read attempt from above
508
- sqlite3_close (dbHandle);
508
+ sqlite3_close_v2 (dbHandle);
509
509
if (sqlite3_open_v2 (filePath.toUtf8 (), &dbHandle, SQLITE_OPEN_READONLY, nullptr ) != SQLITE_OK)
510
510
return false ;
511
511
@@ -527,12 +527,12 @@ bool DBBrowserDB::tryEncryptionSettings(const QString& filePath, bool* encrypted
527
527
*encrypted = true ;
528
528
#else
529
529
lastErrorMessage = QString::fromUtf8 (sqlite3_errmsg (dbHandle));
530
- sqlite3_close (dbHandle);
530
+ sqlite3_close_v2 (dbHandle);
531
531
return false ;
532
532
#endif
533
533
} else {
534
534
sqlite3_finalize (vm);
535
- sqlite3_close (dbHandle);
535
+ sqlite3_close_v2 (dbHandle);
536
536
return true ;
537
537
}
538
538
}
@@ -559,7 +559,7 @@ void DBBrowserDB::getSqliteVersion(QString& sqlite, QString& sqlcipher)
559
559
sqlite3_finalize (stmt);
560
560
}
561
561
562
- sqlite3_close (dummy);
562
+ sqlite3_close_v2 (dummy);
563
563
}
564
564
#endif
565
565
}
@@ -668,7 +668,7 @@ bool DBBrowserDB::create ( const QString & db)
668
668
669
669
if ( openresult != SQLITE_OK ){
670
670
lastErrorMessage = QString::fromUtf8 (sqlite3_errmsg (_db));
671
- sqlite3_close (_db);
671
+ sqlite3_close_v2 (_db);
672
672
_db = nullptr ;
673
673
return false ;
674
674
}
@@ -686,7 +686,7 @@ bool DBBrowserDB::create ( const QString & db)
686
686
687
687
// Close database and open it through the code for opening existing database files. This is slightly less efficient but saves us some duplicate
688
688
// code.
689
- sqlite3_close (_db);
689
+ sqlite3_close_v2 (_db);
690
690
return open (db);
691
691
} else {
692
692
return false ;
@@ -731,7 +731,7 @@ bool DBBrowserDB::close()
731
731
revertAll (); // not really necessary, I think... but will not hurt.
732
732
}
733
733
734
- if (sqlite3_close (_db) != SQLITE_OK)
734
+ if (sqlite3_close_v2 (_db) != SQLITE_OK)
735
735
qWarning () << tr (" Database didn't close correctly, probably still busy" );
736
736
737
737
_db = nullptr ;
@@ -775,7 +775,7 @@ bool DBBrowserDB::saveAs(const std::string& filename) {
775
775
sqlite3_backup* pBackup = sqlite3_backup_init (pTo, " main" , _db, " main" );
776
776
if (pBackup == nullptr ) {
777
777
qWarning () << tr (" Cannot backup to file: '%1'. Message: %2" ).arg (filename.c_str (), sqlite3_errmsg (pTo));
778
- sqlite3_close (pTo);
778
+ sqlite3_close_v2 (pTo);
779
779
return false ;
780
780
} else {
781
781
sqlite3_backup_step (pBackup, -1 );
@@ -786,15 +786,15 @@ bool DBBrowserDB::saveAs(const std::string& filename) {
786
786
787
787
if (rc == SQLITE_OK) {
788
788
// Close current database and set backup as current
789
- sqlite3_close (_db);
789
+ sqlite3_close_v2 (_db);
790
790
_db = pTo;
791
791
curDBFilename = QString::fromStdString (filename);
792
792
793
793
return true ;
794
794
} else {
795
795
qWarning () << tr (" Cannot backup to file: '%1'. Message: %2" ).arg (filename.c_str (), sqlite3_errmsg (pTo));
796
796
// Close failed database connection.
797
- sqlite3_close (pTo);
797
+ sqlite3_close_v2 (pTo);
798
798
return false ;
799
799
}
800
800
}
0 commit comments