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

Deprecate the internal int/uint types in favor of the cstdint types they were based on

Browse source
This commit is contained in:
Tim Wojtulewicz 2019-07-30 11:38:42 -07:00
parent 18e4976c6c
commit 54752ef9a1
218 changed files with 1331 additions and 1323 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/SerializationFormat.h
View file

@ -19,14 +19,14 @@ public:
virtual ~SerializationFormat();
// Unserialization.
virtual void StartRead(const char* data, uint32 len);
virtual void StartRead(const char* data, uint32_t len);
virtual void EndRead();
virtual bool Read(int* v, const char* tag) = 0;
virtual bool Read(uint16* v, const char* tag) = 0;
virtual bool Read(uint32* v, const char* tag) = 0;
virtual bool Read(int64* v, const char* tag) = 0;
virtual bool Read(uint64* v, const char* tag) = 0;
virtual bool Read(uint16_t* v, const char* tag) = 0;
virtual bool Read(uint32_t* v, const char* tag) = 0;
virtual bool Read(int64_t* v, const char* tag) = 0;
virtual bool Read(uint64_t* v, const char* tag) = 0;
virtual bool Read(char* v, const char* tag) = 0;
virtual bool Read(bool* v, const char* tag) = 0;
virtual bool Read(double* d, const char* tag) = 0;
@ -52,13 +52,13 @@ public:
* be reclaimed using "free()".
* @return The number of bytes in the buffer object assigned to \a data.
*/
virtual uint32 EndWrite(char** data);
virtual uint32_t EndWrite(char** data);
virtual bool Write(int v, const char* tag) = 0;
virtual bool Write(uint16 v, const char* tag) = 0;
virtual bool Write(uint32 v, const char* tag) = 0;
virtual bool Write(int64 v, const char* tag) = 0;
virtual bool Write(uint64 v, const char* tag) = 0;
virtual bool Write(uint16_t v, const char* tag) = 0;
virtual bool Write(uint32_t v, const char* tag) = 0;
virtual bool Write(int64_t v, const char* tag) = 0;
virtual bool Write(uint64_t v, const char* tag) = 0;
virtual bool Write(char v, const char* tag) = 0;
virtual bool Write(bool v, const char* tag) = 0;
virtual bool Write(double d, const char* tag) = 0;
@ -81,15 +81,15 @@ protected:
bool ReadData(void* buf, size_t count);
bool WriteData(const void* buf, size_t count);
static const uint32 INITIAL_SIZE = 65536;
static const uint32_t INITIAL_SIZE = 65536;
static const float GROWTH_FACTOR;
char* output;
uint32 output_size;
uint32 output_pos;
uint32_t output_size;
uint32_t output_pos;
const char* input;
uint32 input_len;
uint32 input_pos;
uint32_t input_len;
uint32_t input_pos;
int bytes_written;
int bytes_read;
@ -101,10 +101,10 @@ public:
~BinarySerializationFormat() override;
bool Read(int* v, const char* tag) override;
bool Read(uint16* v, const char* tag) override;
bool Read(uint32* v, const char* tag) override;
bool Read(int64* v, const char* tag) override;
bool Read(uint64* v, const char* tag) override;
bool Read(uint16_t* v, const char* tag) override;
bool Read(uint32_t* v, const char* tag) override;
bool Read(int64_t* v, const char* tag) override;
bool Read(uint64_t* v, const char* tag) override;
bool Read(char* v, const char* tag) override;
bool Read(bool* v, const char* tag) override;
bool Read(double* d, const char* tag) override;
@ -115,10 +115,10 @@ public:
bool Read(struct in_addr* addr, const char* tag) override;
bool Read(struct in6_addr* addr, const char* tag) override;
bool Write(int v, const char* tag) override;
bool Write(uint16 v, const char* tag) override;
bool Write(uint32 v, const char* tag) override;
bool Write(int64 v, const char* tag) override;
bool Write(uint64 v, const char* tag) override;
bool Write(uint16_t v, const char* tag) override;
bool Write(uint32_t v, const char* tag) override;
bool Write(int64_t v, const char* tag) override;
bool Write(uint64_t v, const char* tag) override;
bool Write(char v, const char* tag) override;
bool Write(bool v, const char* tag) override;
bool Write(double d, const char* tag) override;