Cleanup client init states by bumping protocol version

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

diff --git a/src/database-sqlite3.cpp b/src/database-sqlite3.cpp
index b86f0806f25579fc526621bcb50ce3e2376fa272..38fb2ca1931b62f7c3b37d4573ac761e97f66ea4 100644 (file)
--- a/src/database-sqlite3.cpp
+++ b/src/database-sqlite3.cpp
@@ -237,6 +237,7 @@ MapBlock* Database_SQLite3::loadBlock(v3s16 blockpos)
                        } else {
                                throw SerializationError("Blank block data in database");
                        }
+                       return NULL;
                }
 
                std::string datastr(data, len);
@@ -247,7 +248,7 @@ MapBlock* Database_SQLite3::loadBlock(v3s16 blockpos)
                        std::istringstream is(datastr, std::ios_base::binary);
 
                        u8 version = SER_FMT_VER_INVALID;
-                       is.read((char*)&version, 1);
+                       is.read((char *)&version, 1);
 
                        if (is.fail())
                                throw SerializationError("ServerMap::loadBlock(): Failed"
@@ -280,7 +281,7 @@ MapBlock* Database_SQLite3::loadBlock(v3s16 blockpos)
                        // We just loaded it from, so it's up-to-date.
                        block->resetModified();
                }
-               catch(SerializationError &e)
+               catch (SerializationError &e)
                {
                        errorstream << "Invalid block data in database"
                                << " (" << blockpos.X << "," << blockpos.Y << "," << blockpos.Z << ")"