Document zoom_fov in settingtypes.txt and minetest.conf.example

[dragonfireclient.git] / src / database-sqlite3.cpp

diff --git a/src/database-sqlite3.cpp b/src/database-sqlite3.cpp
index 07df976d413c09c582f5c607141004ff8bd47de6..095d485c0f72523d91196fd2d8f04da5681e96d8 100644 (file)
--- a/src/database-sqlite3.cpp
+++ b/src/database-sqlite3.cpp
@@ -56,8 +56,14 @@ SQLite format specification:
        SQLOK(sqlite3_prepare_v2(m_database, query, -1, &m_stmt_##name, NULL),\
                "Failed to prepare query '" query "'")
 
-#define FINALIZE_STATEMENT(statement) \
-       SQLOK(sqlite3_finalize(statement), "Failed to finalize " #statement)
+#define SQLOK_ERRSTREAM(s, m)                           \
+       if ((s) != SQLITE_OK) {                             \
+               errorstream << (m) << ": "                      \
+                       << sqlite3_errmsg(m_database) << std::endl; \
+       }
+
+#define FINALIZE_STATEMENT(statement) SQLOK_ERRSTREAM(sqlite3_finalize(statement), \
+       "Failed to finalize " #statement)
 
 int Database_SQLite3::busyHandler(void *data, int count)
 {
@@ -289,6 +295,6 @@ Database_SQLite3::~Database_SQLite3()
        FINALIZE_STATEMENT(m_stmt_end)
        FINALIZE_STATEMENT(m_stmt_delete)
 
-       SQLOK(sqlite3_close(m_database), "Failed to close database");
+       SQLOK_ERRSTREAM(sqlite3_close(m_database), "Failed to close database");
 }