xPablo.cz/sysvars
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upravy pro nejnovejsi ArduinoJson 7.2.1

Browse Source
This commit is contained in:
Pavel Brychta 2024-12-05 10:34:29 +01:00
parent a42ee82a3a
commit 549a215403
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/sysvars.cpp
View File

@ -27,7 +27,7 @@ T svGetV(const String & name, const T deflt)
if (err) { if (err) {
TRACEPLUS(DEBUG_SYSVARS, TRACE_ERROR, "SV: Deserialize error '%s'", err.c_str()); // wrong JSON file (malformed) TRACEPLUS(DEBUG_SYSVARS, TRACE_ERROR, "SV: Deserialize error '%s'", err.c_str()); // wrong JSON file (malformed)
} else { } else {
if (!doc.containsKey(name)) { if (!doc[name].is<JsonVariant>()) { // key not found
TRACEPLUS(DEBUG_SYSVARS, TRACE_ERROR, "SV: Key '%s' not found", name.c_str()); TRACEPLUS(DEBUG_SYSVARS, TRACE_ERROR, "SV: Key '%s' not found", name.c_str());
} else { } else {
rv = doc[name].as<T>(); rv = doc[name].as<T>();
@ -52,7 +52,7 @@ T svGetVFile(const String & name, const String & fname, const T deflt)
if (err) { if (err) {
TRACEPLUS(DEBUG_SYSVARS, TRACE_ERROR, "SV: Deserialize error '%s'", err.c_str()); // wrong JSON file (malformed) TRACEPLUS(DEBUG_SYSVARS, TRACE_ERROR, "SV: Deserialize error '%s'", err.c_str()); // wrong JSON file (malformed)
} else { } else {
if (!doc.containsKey(name)) { if (!doc[name].is<JsonVariant>()) {
TRACEPLUS(DEBUG_SYSVARS, TRACE_ERROR, "SV: Key '%s' not found", name.c_str()); TRACEPLUS(DEBUG_SYSVARS, TRACE_ERROR, "SV: Key '%s' not found", name.c_str());
} else { } else {
rv = doc[name].as<T>(); rv = doc[name].as<T>();
@ -119,8 +119,7 @@ int svSetVFile(const String & name, T value, const String & fname)
File f = USEDFS.open(fname, "r"); File f = USEDFS.open(fname, "r");
if (f) { if (f) {
const DeserializationError err = deserializeJson(doc, f); if (const DeserializationError err = deserializeJson(doc, f)) {
if (err) {
res = SV_DESERIALIZE_ERROR; // wrong (malformed) JSON file res = SV_DESERIALIZE_ERROR; // wrong (malformed) JSON file
} }
f.close(); f.close();