summaryrefslogtreecommitdiff
path: root/core/io/json.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-07-01 14:32:04 +0200
committerGitHub <noreply@github.com>2019-07-01 14:32:04 +0200
commitb0ce9401ffa731cc346ab6762fd0794709634428 (patch)
treec2e6de01b9efec28c959dbfd5cd59a0973d432e7 /core/io/json.cpp
parent531c92a53e5e7b9a1cb55249ef6086e874239872 (diff)
parent3c154eb93b3a098354bf6d18a9428826ec193f90 (diff)
Merge pull request #30126 from qarmin/remove_unnecessary_code
Remove unnecessary code and add some error explanations
Diffstat (limited to 'core/io/json.cpp')
-rw-r--r--core/io/json.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/io/json.cpp b/core/io/json.cpp
index c211ca2ed4..4e729cb355 100644
--- a/core/io/json.cpp
+++ b/core/io/json.cpp
@@ -347,8 +347,6 @@ Error JSON::_parse_value(Variant &value, Token &token, const CharType *p_str, in
r_err_str = "Expected value, got " + String(tk_name[token.type]) + ".";
return ERR_PARSE_ERROR;
}
-
- return ERR_PARSE_ERROR;
}
Error JSON::_parse_array(Array &array, const CharType *p_str, int &index, int p_len, int &line, String &r_err_str) {