Address review comments.

project-chip · Jan 23, 2024 · 4b79b85 · 4b79b85
1 parent 6c28aef
commit 4b79b85
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 21 deletions.
diff --git a/src/app/data-model/FabricScopedPreEncodedValue.cpp b/src/app/data-model/FabricScopedPreEncodedValue.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "FabricScopedPreEncodedValue.h"
+#include <lib/core/TLVReader.h>
 #include <lib/support/CodeUtils.h>
 
 #include <optional>
@@ -24,17 +25,12 @@ namespace chip {
 namespace app {
 namespace DataModel {
 
-FabricScopedPreEncodedValue::FabricScopedPreEncodedValue(const ByteSpan & aData)
-{
-    mReader.Init(aData);
-}
+FabricScopedPreEncodedValue::FabricScopedPreEncodedValue(const ByteSpan & aData) : mData(aData) {}
 
 CHIP_ERROR FabricScopedPreEncodedValue::EncodeForRead(TLV::TLVWriter & aWriter, TLV::Tag aTag, FabricIndex aFabricIndex) const
 {
-    // Clone our reader, since we need to do Next() to move to its first element
-    // but not change our state.  And CopyElement needs a non-const reader
-    // anyway since it also changes reader state.
-    TLV::TLVReader reader(mReader);
+    TLV::TLVReader reader;
+    reader.Init(mData);
 
     ReturnErrorOnFailure(reader.Next());
 
@@ -43,7 +39,8 @@ CHIP_ERROR FabricScopedPreEncodedValue::EncodeForRead(TLV::TLVWriter & aWriter,
 
 FabricIndex FabricScopedPreEncodedValue::GetFabricIndex() const
 {
-    TLV::TLVReader reader(mReader);
+    TLV::TLVReader reader;
+    reader.Init(mData);
     CHIP_ERROR err = reader.Next();
     if (err != CHIP_NO_ERROR)
     {

diff --git a/src/app/data-model/FabricScopedPreEncodedValue.h b/src/app/data-model/FabricScopedPreEncodedValue.h
@@ -17,7 +17,6 @@
 
 #include <lib/core/CHIPError.h>
 #include <lib/core/DataModelTypes.h>
-#include <lib/core/TLVReader.h>
 #include <lib/core/TLVTags.h>
 #include <lib/core/TLVWriter.h>
 
@@ -51,7 +50,7 @@ class FabricScopedPreEncodedValue
     FabricIndex GetFabricIndex() const;
 
 private:
-    TLV::TLVReader mReader;
+    const ByteSpan mData;
 };
 
 } // namespace DataModel

diff --git a/src/app/data-model/PreEncodedValue.cpp b/src/app/data-model/PreEncodedValue.cpp
@@ -16,23 +16,19 @@
  */
 
 #include "PreEncodedValue.h"
+#include <lib/core/TLVReader.h>
 #include <lib/support/CodeUtils.h>
 
 namespace chip {
 namespace app {
 namespace DataModel {
 
-PreEncodedValue::PreEncodedValue(const ByteSpan & aData)
-{
-    mReader.Init(aData);
-}
+PreEncodedValue::PreEncodedValue(const ByteSpan & aData) : mData(aData) {}
 
 CHIP_ERROR PreEncodedValue::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
-    // Clone our reader, since we need to do Next() to move to its first element
-    // but not change our state.  And CopyElement needs a non-const reader
-    // anyway since it also changes reader state.
-    TLV::TLVReader reader(mReader);
+    TLV::TLVReader reader;
+    reader.Init(mData);
 
     ReturnErrorOnFailure(reader.Next());
 

diff --git a/src/app/data-model/PreEncodedValue.h b/src/app/data-model/PreEncodedValue.h
@@ -16,7 +16,6 @@
  */
 
 #include <lib/core/CHIPError.h>
-#include <lib/core/TLVReader.h>
 #include <lib/core/TLVTags.h>
 #include <lib/core/TLVWriter.h>
 
@@ -45,7 +44,7 @@ class PreEncodedValue
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
 private:
-    TLV::TLVReader mReader;
+    const ByteSpan mData;
 };
 
 } // namespace DataModel