minetest/minetestmapper
1
0
Fork 0
mirror of https://github.com/minetest/minetestmapper.git synced 2024-12-25 02:10:37 +01:00
Code Issues Projects Releases Wiki Activity

DBSQLite3: Do not raise in destructor

Browse Source 
Throwing exception from destructor is not recommended and generates lots
of warnings during compilation.
Don't use macro SQLRES, and:
 - ignore return code of sqlite3_finalize (of no interest here)
 - log to stderr sqlite3_close failure
This commit is contained in:
Christophe Le Roy 2016-10-08 21:09:52 +02:00 committed by sfan5
parent 0bf0d8e035
commit bcbfd00eba
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
db-sqlite3.cpp
View File

@ -1,5 +1,6 @@
#include <stdexcept>
#include <unistd.h> // for usleep
#include <iostream>
#include "db-sqlite3.h"
#include "types.h"
@ -31,11 +32,12 @@ DBSQLite3::DBSQLite3(const std::string &mapdir)
DBSQLite3::~DBSQLite3()
{
int result;
SQLOK(finalize(stmt_get_blocks_z));
SQLOK(finalize(stmt_get_block_pos));
sqlite3_finalize(stmt_get_blocks_z);
sqlite3_finalize(stmt_get_block_pos);
SQLOK(close(db));
if (sqlite3_close(db) != SQLITE_OK) {
std::cerr << "Error closing SQLite database." << std::endl;
};
}
std::vector<BlockPos> DBSQLite3::getBlockPos()