Triplehx3/luanti
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DB::loadBlock copy removal & DB backend cleanup

Browse Source 
* Remove the copy from db::loadBlock by using a pointer to the destination
* cleanup db backend, the child backend doesn't have to set their functions as virtual
This commit is contained in:
Loic Blot
2016-05-14 12:23:15 +02:00
parent decbd396df
commit 143401451c
11 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/database-sqlite3.cpp
View File

@@ -237,7 +237,7 @@ bool Database_SQLite3::saveBlock(const v3s16 &pos, const std::string &data)
return true;
}
std::string Database_SQLite3::loadBlock(const v3s16 &pos)
void Database_SQLite3::loadBlock(const v3s16 &pos, std::string *block)
{
verifyDatabase();
@@ -245,20 +245,17 @@ std::string Database_SQLite3::loadBlock(const v3s16 &pos)
if (sqlite3_step(m_stmt_read) != SQLITE_ROW) {
sqlite3_reset(m_stmt_read);
return "";
return;
}
const char *data = (const char *) sqlite3_column_blob(m_stmt_read, 0);
size_t len = sqlite3_column_bytes(m_stmt_read, 0);
std::string s;
if (data)
s = std::string(data, len);
*block = (data) ? std::string(data, len) : "";
sqlite3_step(m_stmt_read);
// We should never get more than 1 row, so ok to reset
sqlite3_reset(m_stmt_read);
return s;
}
void Database_SQLite3::createDatabase()