From 5070fa65623e299a444290d5f67e13feae24f682 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Mon, 22 May 2023 10:23:43 +0200 Subject: [PATCH] Rename `memberFilter` to `elementFilter` in deserializers --- src/ArduinoJson/Json/JsonDeserializer.hpp | 6 +++--- src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ArduinoJson/Json/JsonDeserializer.hpp b/src/ArduinoJson/Json/JsonDeserializer.hpp index fed8da64..b1d1a19f 100644 --- a/src/ArduinoJson/Json/JsonDeserializer.hpp +++ b/src/ArduinoJson/Json/JsonDeserializer.hpp @@ -166,18 +166,18 @@ class JsonDeserializer { if (eat(']')) return DeserializationError::Ok; - TFilter memberFilter = filter[0UL]; + TFilter elementFilter = filter[0UL]; // Read each value for (;;) { - if (memberFilter.allow()) { + if (elementFilter.allow()) { // Allocate slot in array VariantData* value = collectionAddElement(&array, pool_); if (!value) return DeserializationError::NoMemory; // 1 - Parse value - err = parseVariant(*value, memberFilter, nestingLimit.decrement()); + err = parseVariant(*value, elementFilter, nestingLimit.decrement()); if (err) return err; } else { diff --git a/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp b/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp index 138c498f..a9b19d37 100644 --- a/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp +++ b/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp @@ -427,12 +427,12 @@ class MsgPackDeserializer { array = 0; } - TFilter memberFilter = filter[0U]; + TFilter elementFilter = filter[0U]; for (; n; --n) { VariantData* value; - if (memberFilter.allow()) { + if (elementFilter.allow()) { ARDUINOJSON_ASSERT(array != 0); value = collectionAddElement(array, pool_); if (!value) @@ -441,7 +441,7 @@ class MsgPackDeserializer { value = 0; } - err = parseVariant(value, memberFilter, nestingLimit.decrement()); + err = parseVariant(value, elementFilter, nestingLimit.decrement()); if (err) return err; }