From fead19560c0ef18307bfc316dc7319225ef18a54 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Tue, 2 May 2023 10:04:09 +0200 Subject: [PATCH] Rename `visitRawJson()` to `visitRawString()` --- src/ArduinoJson/Json/JsonSerializer.hpp | 2 +- src/ArduinoJson/MsgPack/MsgPackSerializer.hpp | 2 +- src/ArduinoJson/Variant/VariantCompare.hpp | 4 ++-- src/ArduinoJson/Variant/VariantData.hpp | 4 ++-- src/ArduinoJson/Variant/Visitor.hpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ArduinoJson/Json/JsonSerializer.hpp b/src/ArduinoJson/Json/JsonSerializer.hpp index 781c9c93..bbd5ec54 100644 --- a/src/ArduinoJson/Json/JsonSerializer.hpp +++ b/src/ArduinoJson/Json/JsonSerializer.hpp @@ -73,7 +73,7 @@ class JsonSerializer : public Visitor { return bytesWritten(); } - size_t visitRawJson(const char* data, size_t n) { + size_t visitRawString(const char* data, size_t n) { formatter_.writeRaw(data, n); return bytesWritten(); } diff --git a/src/ArduinoJson/MsgPack/MsgPackSerializer.hpp b/src/ArduinoJson/MsgPack/MsgPackSerializer.hpp index 65769a16..f19f626c 100644 --- a/src/ArduinoJson/MsgPack/MsgPackSerializer.hpp +++ b/src/ArduinoJson/MsgPack/MsgPackSerializer.hpp @@ -102,7 +102,7 @@ class MsgPackSerializer : public Visitor { return bytesWritten(); } - size_t visitRawJson(const char* data, size_t size) { + size_t visitRawString(const char* data, size_t size) { writeBytes(reinterpret_cast(data), size); return bytesWritten(); } diff --git a/src/ArduinoJson/Variant/VariantCompare.hpp b/src/ArduinoJson/Variant/VariantCompare.hpp index 42445c6b..8fcbd0cd 100644 --- a/src/ArduinoJson/Variant/VariantCompare.hpp +++ b/src/ArduinoJson/Variant/VariantCompare.hpp @@ -113,7 +113,7 @@ struct RawComparer : ComparerBase { explicit RawComparer(const char* rhsData, size_t rhsSize) : rhsData_(rhsData), rhsSize_(rhsSize) {} - CompareResult visitRawJson(const char* lhsData, size_t lhsSize) { + CompareResult visitRawString(const char* lhsData, size_t lhsSize) { size_t size = rhsSize_ < lhsSize ? rhsSize_ : lhsSize; int n = memcmp(lhsData, rhsData_, size); if (n < 0) @@ -150,7 +150,7 @@ struct VariantComparer : ComparerBase { return accept(comparer); } - CompareResult visitRawJson(const char* lhsData, size_t lhsSize) { + CompareResult visitRawString(const char* lhsData, size_t lhsSize) { RawComparer comparer(lhsData, lhsSize); return accept(comparer); } diff --git a/src/ArduinoJson/Variant/VariantData.hpp b/src/ArduinoJson/Variant/VariantData.hpp index b439be50..a6e85c60 100644 --- a/src/ArduinoJson/Variant/VariantData.hpp +++ b/src/ArduinoJson/Variant/VariantData.hpp @@ -46,8 +46,8 @@ class VariantData { content_.asString.size); case VALUE_IS_RAW_STRING: - return visitor.visitRawJson(content_.asString.data, - content_.asString.size); + return visitor.visitRawString(content_.asString.data, + content_.asString.size); case VALUE_IS_SIGNED_INTEGER: return visitor.visitSignedInteger(content_.asSignedInteger); diff --git a/src/ArduinoJson/Variant/Visitor.hpp b/src/ArduinoJson/Variant/Visitor.hpp index f1c78416..bdc2a6b0 100644 --- a/src/ArduinoJson/Variant/Visitor.hpp +++ b/src/ArduinoJson/Variant/Visitor.hpp @@ -42,7 +42,7 @@ struct Visitor { return TResult(); } - TResult visitRawJson(const char*, size_t) { + TResult visitRawString(const char*, size_t) { return TResult(); }