diff --git a/include/tscore/HashFNV.h b/include/tscore/HashFNV.h index 0ea09bbe08a..57a7c4b0bb1 100644 --- a/include/tscore/HashFNV.h +++ b/include/tscore/HashFNV.h @@ -45,7 +45,8 @@ struct ATSHash32FNV1a : ATSHash32 { void clear() override; private: - uint32_t hval; + static constexpr uint32_t fnv_init = 0x811c9dc5u; + uint32_t hval{fnv_init}; }; template @@ -76,7 +77,8 @@ struct ATSHash64FNV1a : ATSHash64 { void clear() override; private: - uint64_t hval; + static constexpr uint64_t fnv_init = 0xcbf29ce484222325ull; + uint64_t hval{fnv_init}; }; template diff --git a/src/proxy/http3/Http3Frame.cc b/src/proxy/http3/Http3Frame.cc index b3de9d2bffe..0060dad16d9 100644 --- a/src/proxy/http3/Http3Frame.cc +++ b/src/proxy/http3/Http3Frame.cc @@ -505,7 +505,7 @@ Http3FrameFactory::create(IOBufferReader &reader) ts::Http3Config::scoped_config params; Http3Frame *frame = nullptr; - uint8_t type_buf[FRAME_TYPE_MAX_BYTES]; + uint8_t type_buf[FRAME_TYPE_MAX_BYTES]{}; reader.memcpy(type_buf, sizeof(type_buf)); Http3FrameType type = Http3Frame::type(type_buf, sizeof(type_buf)); diff --git a/src/tscore/HashFNV.cc b/src/tscore/HashFNV.cc index b060ab4205a..b84d9a8f78a 100644 --- a/src/tscore/HashFNV.cc +++ b/src/tscore/HashFNV.cc @@ -9,14 +9,8 @@ #include "tscore/HashFNV.h" -static const uint32_t FNV_INIT_32 = 0x811c9dc5u; -static const uint64_t FNV_INIT_64 = 0xcbf29ce484222325ull; - -// FNV-1a 64bit -ATSHash32FNV1a::ATSHash32FNV1a() -{ - this->clear(); -} +// FNV-1a 32bit +ATSHash32FNV1a::ATSHash32FNV1a() = default; void ATSHash32FNV1a::final() @@ -32,14 +26,11 @@ ATSHash32FNV1a::get() const void ATSHash32FNV1a::clear() { - hval = FNV_INIT_32; + hval = fnv_init; } // FNV-1a 64bit -ATSHash64FNV1a::ATSHash64FNV1a() -{ - this->clear(); -} +ATSHash64FNV1a::ATSHash64FNV1a() = default; void ATSHash64FNV1a::final() { @@ -54,5 +45,5 @@ ATSHash64FNV1a::get() const void ATSHash64FNV1a::clear() { - hval = FNV_INIT_64; + hval = fnv_init; }