feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Rename memberFilter to elementFilter in deserializers

Browse Source
This commit is contained in:
Benoit Blanchon
2023-05-22 10:23:43 +02:00
parent d9e035a288
commit 5070fa6562
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ArduinoJson/Json/JsonDeserializer.hpp
View File

@ -166,18 +166,18 @@ class JsonDeserializer {
if (eat(']')) if (eat(']'))
return DeserializationError::Ok; return DeserializationError::Ok;
TFilter memberFilter = filter[0UL]; TFilter elementFilter = filter[0UL];
// Read each value // Read each value
for (;;) { for (;;) {
if (memberFilter.allow()) { if (elementFilter.allow()) {
// Allocate slot in array // Allocate slot in array
VariantData* value = collectionAddElement(&array, pool_); VariantData* value = collectionAddElement(&array, pool_);
if (!value) if (!value)
return DeserializationError::NoMemory; return DeserializationError::NoMemory;
// 1 - Parse value // 1 - Parse value
err = parseVariant(*value, memberFilter, nestingLimit.decrement()); err = parseVariant(*value, elementFilter, nestingLimit.decrement());
if (err) if (err)
return err; return err;
} else { } else {

6
src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp
View File

@ -427,12 +427,12 @@ class MsgPackDeserializer {
array = 0; array = 0;
} }
TFilter memberFilter = filter[0U]; TFilter elementFilter = filter[0U];
for (; n; --n) { for (; n; --n) {
VariantData* value; VariantData* value;
if (memberFilter.allow()) { if (elementFilter.allow()) {
ARDUINOJSON_ASSERT(array != 0); ARDUINOJSON_ASSERT(array != 0);
value = collectionAddElement(array, pool_); value = collectionAddElement(array, pool_);
if (!value) if (!value)
@ -441,7 +441,7 @@ class MsgPackDeserializer {
value = 0; value = 0;
} }
err = parseVariant(value, memberFilter, nestingLimit.decrement()); err = parseVariant(value, elementFilter, nestingLimit.decrement());
if (err) if (err)
return err; return err;
} }