BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix statement not set NULL on deletion

Browse Source 
Make local only variables static
This commit is contained in:
sapier 2014-06-25 19:59:45 +02:00
parent 09ba047c01
commit 24face5249
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/rollback.cpp
View File

@ -36,17 +36,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define POINTS_PER_NODE (16.0) #define POINTS_PER_NODE (16.0)
std::string dbp; static std::string dbp;
sqlite3* dbh; static sqlite3* dbh = NULL;
sqlite3_stmt* dbs_insert; static sqlite3_stmt* dbs_insert = NULL;
sqlite3_stmt* dbs_replace; static sqlite3_stmt* dbs_replace = NULL;
sqlite3_stmt* dbs_select; static sqlite3_stmt* dbs_select = NULL;
sqlite3_stmt* dbs_select_range; static sqlite3_stmt* dbs_select_range = NULL;
sqlite3_stmt* dbs_select_withActor; static sqlite3_stmt* dbs_select_withActor = NULL;
sqlite3_stmt* dbs_knownActor_select; static sqlite3_stmt* dbs_knownActor_select = NULL;
sqlite3_stmt* dbs_knownActor_insert; static sqlite3_stmt* dbs_knownActor_insert = NULL;
sqlite3_stmt* dbs_knownNode_select; static sqlite3_stmt* dbs_knownNode_select = NULL;
sqlite3_stmt* dbs_knownNode_insert; static sqlite3_stmt* dbs_knownNode_insert = NULL;
struct Stack { struct Stack {
int node; int node;
@ -1094,6 +1094,7 @@ public:
#define FINALIZE_STATEMENT(statement) \ #define FINALIZE_STATEMENT(statement) \
if ( statement ) \ if ( statement ) \
rc = sqlite3_finalize(statement); \ rc = sqlite3_finalize(statement); \
statement = NULL; \
if ( rc != SQLITE_OK ) \ if ( rc != SQLITE_OK ) \
errorstream << "RollbackManager::~RollbackManager():" \ errorstream << "RollbackManager::~RollbackManager():" \
<< "Failed to finalize: " << #statement << ": rc=" << rc << std::endl; << "Failed to finalize: " << #statement << ": rc=" << rc << std::endl;
@ -1117,6 +1118,8 @@ public:
if(dbh) if(dbh)
rc = sqlite3_close(dbh); rc = sqlite3_close(dbh);
dbh = NULL;
if (rc != SQLITE_OK) { if (rc != SQLITE_OK) {
errorstream << "RollbackManager::~RollbackManager(): " errorstream << "RollbackManager::~RollbackManager(): "
<< "Failed to close database: rc=" << rc << std::endl; << "Failed to close database: rc=" << rc << std::endl;