Rename get_json_value to read_json_value

diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index a8f87424197ab1bc3505a77753cb54819dfe6d6d..962391a04280cb9c4f6e6e17f712e07ea1f93969 100644 (file)
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -1088,7 +1088,7 @@ bool push_json_value(lua_State *L, const Json::Value &value, int nullindex)
 }
 
 // Converts Lua table --> JSON
-void get_json_value(lua_State *L, Json::Value &root, int index)
+void read_json_value(lua_State *L, Json::Value &root, int index)
 {
        int type = lua_type(L, index);
        if (type == LUA_TBOOLEAN) {
@@ -1104,7 +1104,7 @@ void get_json_value(lua_State *L, Json::Value &root, int index)
                while (lua_next(L, index)) {
                        // Key is at -2 and value is at -1
                        Json::Value value;
-                       get_json_value(L, value, lua_gettop(L));
+                       read_json_value(L, value, lua_gettop(L));
 
                        Json::ValueType roottype = root.type();
                        int keytype = lua_type(L, -1);

diff --git a/src/script/common/c_content.h b/src/script/common/c_content.h
index 3b85e5403f538521c64cdeaa4f092bb5b08bc0a1..c2d84ac11d7616611f31686f90c12d29271a4ca5 100644 (file)
--- a/src/script/common/c_content.h
+++ b/src/script/common/c_content.h
@@ -150,7 +150,7 @@ void               luaentity_get             (lua_State *L,u16 id);
 bool               push_json_value           (lua_State *L,
                                               const Json::Value &value,
                                               int nullindex);
-void               get_json_value            (lua_State *L,
+void               read_json_value           (lua_State *L,
                                               Json::Value &root,
                                               int index);
 

diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp
index f9ec94db403e1133ff172a9173585a7ef1bf783f..f2bbf181de6697928bf5cf05e50be119e02646ee 100644 (file)
--- a/src/script/lua_api/l_util.cpp
+++ b/src/script/lua_api/l_util.cpp
@@ -192,7 +192,7 @@ int ModApiUtil::l_write_json(lua_State *L)
 
        Json::Value root;
        try {
-               get_json_value(L, root, 1);
+               read_json_value(L, root, 1);
        } catch (SerializationError &e) {
                lua_pushnil(L);
                lua_pushstring(L, e.what());