diff --git a/src/SerializationFormat.cc b/src/SerializationFormat.cc index a005a103cf..10dd4f29ea 100644 --- a/src/SerializationFormat.cc +++ b/src/SerializationFormat.cc @@ -107,15 +107,6 @@ bool BinarySerializationFormat::Read(int* v, const char* tag) return true; } -bool BinarySerializationFormat::Read(uint8* v, const char* tag) - { - if ( ! ReadData(v, sizeof(*v)) ) - return false; - - DBG_LOG(DBG_SERIAL, "Read uint8 %hu [%s]", *v, tag); - return true; - } - bool BinarySerializationFormat::Read(uint16* v, const char* tag) { if ( ! ReadData(v, sizeof(*v)) ) @@ -310,12 +301,6 @@ bool BinarySerializationFormat::Write(char v, const char* tag) return WriteData(&v, 1); } -bool BinarySerializationFormat::Write(uint8 v, const char* tag) - { - DBG_LOG(DBG_SERIAL, "Write uint8 %hu [%s]", v, tag); - return WriteData(&v, sizeof(v)); - } - bool BinarySerializationFormat::Write(uint16 v, const char* tag) { DBG_LOG(DBG_SERIAL, "Write uint16 %hu [%s]", v, tag); @@ -462,12 +447,6 @@ bool XMLSerializationFormat::Read(int* v, const char* tag) return false; } -bool XMLSerializationFormat::Read(uint8* v, const char* tag) - { - reporter->InternalError("no reading of xml"); - return false; - } - bool XMLSerializationFormat::Read(uint16* v, const char* tag) { reporter->InternalError("no reading of xml"); @@ -551,13 +530,6 @@ bool XMLSerializationFormat::Write(char v, const char* tag) return WriteElem(tag, "char", &v, 1); } -bool XMLSerializationFormat::Write(uint8 v, const char* tag) - { - const char* tmp = fmt("%" PRIu8, v); - return WriteElem(tag, "uint8", tmp, strlen(tmp)); - } - - bool XMLSerializationFormat::Write(uint16 v, const char* tag) { const char* tmp = fmt("%" PRIu16, v); diff --git a/src/SerializationFormat.h b/src/SerializationFormat.h index 05cf56d961..f270b61bae 100644 --- a/src/SerializationFormat.h +++ b/src/SerializationFormat.h @@ -23,7 +23,6 @@ public: virtual void EndRead(); virtual bool Read(int* v, const char* tag) = 0; - virtual bool Read(uint8* 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; @@ -48,7 +47,6 @@ public: virtual uint32 EndWrite(char** data); // passes ownership virtual bool Write(int v, const char* tag) = 0; - virtual bool Write(uint8 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; @@ -94,7 +92,6 @@ public: virtual ~BinarySerializationFormat(); virtual bool Read(int* v, const char* tag); - virtual bool Read(uint8* v, const char* tag); virtual bool Read(uint16* v, const char* tag); virtual bool Read(uint32* v, const char* tag); virtual bool Read(int64* v, const char* tag); @@ -109,7 +106,6 @@ public: virtual bool Read(struct in_addr* addr, const char* tag); virtual bool Read(struct in6_addr* addr, const char* tag); virtual bool Write(int v, const char* tag); - virtual bool Write(uint8 v, const char* tag); virtual bool Write(uint16 v, const char* tag); virtual bool Write(uint32 v, const char* tag); virtual bool Write(int64 v, const char* tag); @@ -136,7 +132,6 @@ public: // We don't write anything if tag is nil. virtual bool Write(int v, const char* tag); - virtual bool Write(uint8 v, const char* tag); virtual bool Write(uint16 v, const char* tag); virtual bool Write(uint32 v, const char* tag); virtual bool Write(int64 v, const char* tag); @@ -157,7 +152,6 @@ public: // Not implemented. virtual bool Read(int* v, const char* tag); - virtual bool Read(uint8* v, const char* tag); virtual bool Read(uint16* v, const char* tag); virtual bool Read(uint32* v, const char* tag); virtual bool Read(int64* v, const char* tag); diff --git a/src/Serializer.h b/src/Serializer.h index 719d4dc527..72e0723880 100644 --- a/src/Serializer.h +++ b/src/Serializer.h @@ -54,7 +54,6 @@ public: DECLARE_WRITE(type) DECLARE_IO(int) - DECLARE_IO(uint8) DECLARE_IO(uint16) DECLARE_IO(uint32) DECLARE_IO(int64) diff --git a/src/probabilistic/CardinalityCounter.cc b/src/probabilistic/CardinalityCounter.cc index 7a1814d6ae..b9e0744225 100644 --- a/src/probabilistic/CardinalityCounter.cc +++ b/src/probabilistic/CardinalityCounter.cc @@ -161,7 +161,7 @@ bool CardinalityCounter::Serialize(SerialInfo* info) const valid &= SERIALIZE(alpha_m); for ( unsigned int i = 0; i < m; i++ ) - valid &= SERIALIZE(buckets[i]); + valid &= SERIALIZE((char)buckets[i]); return valid; } @@ -183,8 +183,9 @@ CardinalityCounter* CardinalityCounter::Unserialize(UnserialInfo* info) for ( unsigned int i = 0; i < m; i++ ) { - uint8_t* currbucket = buckets + i; - valid &= UNSERIALIZE(currbucket); + char c; + valid &= UNSERIALIZE(&c); + buckets[i] = (uint8)c; } return valid ? c : 0;