Add some const to TLVReader get methods (#28167)

* Move some TLV reader get methods to const (integers and bools) * Move floating point getters to const * minor change to kick CI --------- Co-authored-by: Andrei Litvin <andreilitvin@google.com>
project-chip · Sep 12, 2023 · 1086848 · 1086848
1 parent 14794ed
commit 1086848
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 23 deletions.
diff --git a/src/lib/core/TLVReader.cpp b/src/lib/core/TLVReader.cpp
@@ -117,7 +117,7 @@ uint32_t TLVReader::GetLength() const
     return 0;
 }
 
-CHIP_ERROR TLVReader::Get(bool & v)
+CHIP_ERROR TLVReader::Get(bool & v) const
 {
     TLVElementType elemType = ElementType();
     if (elemType == TLVElementType::BooleanFalse)
@@ -129,7 +129,7 @@ CHIP_ERROR TLVReader::Get(bool & v)
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR TLVReader::Get(int8_t & v)
+CHIP_ERROR TLVReader::Get(int8_t & v) const
 {
     int64_t v64    = 0;
     CHIP_ERROR err = Get(v64);
@@ -141,7 +141,7 @@ CHIP_ERROR TLVReader::Get(int8_t & v)
     return err;
 }
 
-CHIP_ERROR TLVReader::Get(int16_t & v)
+CHIP_ERROR TLVReader::Get(int16_t & v) const
 {
     int64_t v64    = 0;
     CHIP_ERROR err = Get(v64);
@@ -153,7 +153,7 @@ CHIP_ERROR TLVReader::Get(int16_t & v)
     return err;
 }
 
-CHIP_ERROR TLVReader::Get(int32_t & v)
+CHIP_ERROR TLVReader::Get(int32_t & v) const
 {
     int64_t v64    = 0;
     CHIP_ERROR err = Get(v64);
@@ -165,7 +165,7 @@ CHIP_ERROR TLVReader::Get(int32_t & v)
     return err;
 }
 
-CHIP_ERROR TLVReader::Get(int64_t & v)
+CHIP_ERROR TLVReader::Get(int64_t & v) const
 {
     // Internal callers of this method depend on it not modifying "v" on failure.
     switch (ElementType())
@@ -189,7 +189,7 @@ CHIP_ERROR TLVReader::Get(int64_t & v)
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR TLVReader::Get(uint8_t & v)
+CHIP_ERROR TLVReader::Get(uint8_t & v) const
 {
     uint64_t v64   = 0;
     CHIP_ERROR err = Get(v64);
@@ -201,7 +201,7 @@ CHIP_ERROR TLVReader::Get(uint8_t & v)
     return err;
 }
 
-CHIP_ERROR TLVReader::Get(uint16_t & v)
+CHIP_ERROR TLVReader::Get(uint16_t & v) const
 {
     uint64_t v64   = 0;
     CHIP_ERROR err = Get(v64);
@@ -213,7 +213,7 @@ CHIP_ERROR TLVReader::Get(uint16_t & v)
     return err;
 }
 
-CHIP_ERROR TLVReader::Get(uint32_t & v)
+CHIP_ERROR TLVReader::Get(uint32_t & v) const
 {
     uint64_t v64   = 0;
     CHIP_ERROR err = Get(v64);
@@ -225,7 +225,7 @@ CHIP_ERROR TLVReader::Get(uint32_t & v)
     return err;
 }
 
-CHIP_ERROR TLVReader::Get(uint64_t & v)
+CHIP_ERROR TLVReader::Get(uint64_t & v) const
 {
     // Internal callers of this method depend on it not modifying "v" on failure.
     switch (ElementType())
@@ -256,7 +256,7 @@ float BitCastToFloat(const uint64_t elemLenOrVal)
 // between float and double wherever possible, because these conversions are
 // relatively expensive on platforms that use soft-float instruction sets.
 
-CHIP_ERROR TLVReader::Get(float & v)
+CHIP_ERROR TLVReader::Get(float & v) const
 {
     switch (ElementType())
     {
@@ -270,7 +270,7 @@ CHIP_ERROR TLVReader::Get(float & v)
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR TLVReader::Get(double & v)
+CHIP_ERROR TLVReader::Get(double & v) const
 {
     switch (ElementType())
     {

diff --git a/src/lib/core/TLVReader.h b/src/lib/core/TLVReader.h
@@ -31,7 +31,6 @@
 #include <lib/core/Optional.h>
 
 #include "TLVCommon.h"
-
 #include "TLVWriter.h"
 
 /**
@@ -283,7 +282,7 @@ class DLL_EXPORT TLVReader
      * @retval #CHIP_ERROR_WRONG_TLV_TYPE  If the current element is not a TLV boolean type, or the
      *                                      reader is not positioned on an element.
      */
-    CHIP_ERROR Get(bool & v);
+    CHIP_ERROR Get(bool & v) const;
 
     /**
      * Get the value of the current element as an 8-bit signed integer.
@@ -298,7 +297,7 @@ class DLL_EXPORT TLVReader
      *                                      unsigned), or the reader is not positioned on an element.
      *
      */
-    CHIP_ERROR Get(int8_t & v);
+    CHIP_ERROR Get(int8_t & v) const;
 
     /**
      * Get the value of the current element as a 16-bit signed integer.
@@ -313,7 +312,7 @@ class DLL_EXPORT TLVReader
      *                                      unsigned), or the reader is not positioned on an element.
      *
      */
-    CHIP_ERROR Get(int16_t & v);
+    CHIP_ERROR Get(int16_t & v) const;
 
     /**
      * Get the value of the current element as a 32-bit signed integer.
@@ -328,7 +327,7 @@ class DLL_EXPORT TLVReader
      *                                      unsigned), or the reader is not positioned on an element.
      *
      */
-    CHIP_ERROR Get(int32_t & v);
+    CHIP_ERROR Get(int32_t & v) const;
 
     /**
      * Get the value of the current element as a 64-bit signed integer.
@@ -343,7 +342,7 @@ class DLL_EXPORT TLVReader
      *                                      unsigned), or the reader is not positioned on an element.
      *
      */
-    CHIP_ERROR Get(int64_t & v);
+    CHIP_ERROR Get(int64_t & v) const;
 
     /**
      * Get the value of the current element as an 8-bit unsigned integer.
@@ -359,7 +358,7 @@ class DLL_EXPORT TLVReader
      *                                      unsigned), or the reader is not positioned on an element.
      *
      */
-    CHIP_ERROR Get(uint8_t & v);
+    CHIP_ERROR Get(uint8_t & v) const;
 
     /**
      * Get the value of the current element as a 16-bit unsigned integer.
@@ -375,7 +374,7 @@ class DLL_EXPORT TLVReader
      *                                      unsigned), or the reader is not positioned on an element.
      *
      */
-    CHIP_ERROR Get(uint16_t & v);
+    CHIP_ERROR Get(uint16_t & v) const;
 
     /**
      * Get the value of the current element as a 32-bit unsigned integer.
@@ -391,7 +390,7 @@ class DLL_EXPORT TLVReader
      unsigned), or the reader is not positioned on an element.
      *
      */
-    CHIP_ERROR Get(uint32_t & v);
+    CHIP_ERROR Get(uint32_t & v) const;
 
     /**
      * Get the value of the current element as a 64-bit unsigned integer.
@@ -405,7 +404,7 @@ class DLL_EXPORT TLVReader
      *                                      unsigned), or the reader is not positioned on an element.
      *
      */
-    CHIP_ERROR Get(uint64_t & v);
+    CHIP_ERROR Get(uint64_t & v) const;
 
     /**
      * Get the value of the current element as a double-precision floating point number.
@@ -417,7 +416,7 @@ class DLL_EXPORT TLVReader
      *                                      the reader is not positioned on an element.
      *
      */
-    CHIP_ERROR Get(double & v);
+    CHIP_ERROR Get(double & v) const;
 
     /**
      * Get the value of the current element as a single-precision floating point number.
@@ -429,7 +428,7 @@ class DLL_EXPORT TLVReader
      *                                      the reader is not positioned on an element.
      *
      */
-    CHIP_ERROR Get(float & v);
+    CHIP_ERROR Get(float & v) const;
 
     /**
      * Get the value of the current element as a ByteSpan