Commit 3bb879d1 authored by johan's avatar johan

Revert "Use bctoolbox sqlite3 vfs"

This reverts commit 7e05e033.
parent ae9c0f81
......@@ -18,7 +18,6 @@
*/
#include <bctoolbox/exception.hh>
#include <bctoolbox/sqlite3_vfs.h>
#include <soci/soci.h>
#include <set>
#include <mutex>
......@@ -40,7 +39,7 @@ namespace lime {
/* Db public API */
/* */
/******************************************************************************/
Db::Db(const std::string &filename, std::shared_ptr<std::recursive_mutex> db_mutex) : sql{"sqlite3", std::string("db=").append(filename).append(" vfs=").append(BCTBX_SQLITE3_VFS)}, m_db_mutex{db_mutex} {
Db::Db(const std::string &filename, std::shared_ptr<std::recursive_mutex> db_mutex) : sql{"sqlite3", filename}, m_db_mutex{db_mutex} {
std::lock_guard<std::recursive_mutex> lock(*m_db_mutex);
constexpr int db_module_table_not_holding_lime_row = -1;
......
......@@ -26,6 +26,7 @@
#include "belle-sip/belle-sip.h"
#include "lime_crypto_primitives.hpp"
#include "soci/sqlite3/soci-sqlite3.h"
#include <random>
#include <mutex>
......
......@@ -17,14 +17,12 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "bctoolbox/sqlite3_vfs.h"
#include "lime_log.hpp"
#include "belle-sip/belle-sip.h"
#include "lime-tester.hpp"
#include "lime-tester-utils.hpp"
static const char *log_domain = "lime";
bool cleanDatabase = true;
#ifdef FFI_ENABLED
......@@ -62,9 +60,6 @@ void lime_tester_init(void(*ftester_printf)(int level, const char *fmt, va_list
#ifdef FFI_ENABLED
bc_tester_add_suite(&lime_ffi_test_suite);
#endif
/* enable the bctbx sqlite3 vfs but do not make it default */
sqlite3_bctbx_vfs_register(0);
}
void lime_tester_uninit(void) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment