From e1342ff72da9f0d317b78e4f6741a71cbb49c60b Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Thu, 24 Jul 2025 18:30:58 -0700 Subject: [PATCH] Use size_t for byte sizes in SerializationFormat --- src/SerializationFormat.cc | 4 ++-- src/SerializationFormat.h | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/SerializationFormat.cc b/src/SerializationFormat.cc index b932e97497..3dbf1d0b73 100644 --- a/src/SerializationFormat.cc +++ b/src/SerializationFormat.cc @@ -40,8 +40,8 @@ void SerializationFormat::StartWrite() { bytes_written = 0; } -uint32_t SerializationFormat::EndWrite(char** data) { - uint32_t rval = output_pos; +size_t SerializationFormat::EndWrite(char** data) { + size_t rval = output_pos; *data = output; output = nullptr; output_size = 0; diff --git a/src/SerializationFormat.h b/src/SerializationFormat.h index c501301891..f99e502add 100644 --- a/src/SerializationFormat.h +++ b/src/SerializationFormat.h @@ -57,7 +57,7 @@ public: * be reclaimed using "free()". * @return The number of bytes in the buffer object assigned to \a data. */ - virtual uint32_t EndWrite(char** data); + virtual size_t EndWrite(char** data); virtual bool Write(int v, const char* tag) = 0; virtual bool Write(uint16_t v, const char* tag) = 0; @@ -80,7 +80,7 @@ public: virtual bool WriteSeparator() = 0; // Returns number of raw bytes written since last call to StartWrite(). - int BytesWritten() const { return bytes_written; } + size_t BytesWritten() const { return bytes_written; } protected: bool ReadData(void* buf, size_t count); @@ -89,15 +89,15 @@ protected: static const uint32_t INITIAL_SIZE = 65536; static const float GROWTH_FACTOR; char* output = nullptr; - uint32_t output_size = 0; - uint32_t output_pos = 0; + size_t output_size = 0; + size_t output_pos = 0; const char* input = nullptr; - uint32_t input_len = 0; - uint32_t input_pos = 0; + size_t input_len = 0; + size_t input_pos = 0; - int bytes_written = 0; - int bytes_read = 0; + size_t bytes_written = 0; + size_t bytes_read = 0; }; class BinarySerializationFormat final : public SerializationFormat {