From: ShadowNinja <shadowninja@minetest.net>
Date: Sat, 11 Jan 2014 18:47:59 +0000 (-0500)
Subject: Rename get_json_value to read_json_value
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=a9df87ede06f8f0f69e3481cf58f6d59d3f9ebbf;p=zefram%2Fminetest%2Fminetest_engine.git

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 a8f87424..962391a0 100644
--- 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 3b85e540..c2d84ac1 100644
--- 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 f9ec94db..f2bbf181 100644
--- 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());