Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use size_t for byte sizes in SerializationFormat

Browse source
This commit is contained in:
Tim Wojtulewicz 2025-07-24 18:30:58 -07:00
parent 7a5209855f
commit e1342ff72d
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/SerializationFormat.cc
View file

@ -40,8 +40,8 @@ void SerializationFormat::StartWrite() {
bytes_written = 0; bytes_written = 0;
} }
uint32_t SerializationFormat::EndWrite(char** data) { size_t SerializationFormat::EndWrite(char** data) {
uint32_t rval = output_pos; size_t rval = output_pos;
*data = output; *data = output;
output = nullptr; output = nullptr;
output_size = 0; output_size = 0;

16
src/SerializationFormat.h
View file

@ -57,7 +57,7 @@ public:
* be reclaimed using "free()". * be reclaimed using "free()".
* @return The number of bytes in the buffer object assigned to \a data. * @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(int v, const char* tag) = 0;
virtual bool Write(uint16_t v, const char* tag) = 0; virtual bool Write(uint16_t v, const char* tag) = 0;
@ -80,7 +80,7 @@ public:
virtual bool WriteSeparator() = 0; virtual bool WriteSeparator() = 0;
// Returns number of raw bytes written since last call to StartWrite(). // 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: protected:
bool ReadData(void* buf, size_t count); bool ReadData(void* buf, size_t count);
@ -89,15 +89,15 @@ protected:
static const uint32_t INITIAL_SIZE = 65536; static const uint32_t INITIAL_SIZE = 65536;
static const float GROWTH_FACTOR; static const float GROWTH_FACTOR;
char* output = nullptr; char* output = nullptr;
uint32_t output_size = 0; size_t output_size = 0;
uint32_t output_pos = 0; size_t output_pos = 0;
const char* input = nullptr; const char* input = nullptr;
uint32_t input_len = 0; size_t input_len = 0;
uint32_t input_pos = 0; size_t input_pos = 0;
int bytes_written = 0; size_t bytes_written = 0;
int bytes_read = 0; size_t bytes_read = 0;
}; };
class BinarySerializationFormat final : public SerializationFormat { class BinarySerializationFormat final : public SerializationFormat {