From d36a387aca39402b1da7ca9fb26c538f07d0a8b6 Mon Sep 17 00:00:00 2001 From: Larry Doolittle Date: Thu, 7 Nov 2024 19:49:25 -0800 Subject: [PATCH] kernel/drivertools.h: avoid maybe-uninitialized compile warnings Initialize "unsigned int inner" in hash() functions Includes a log_assert() that might help catch corrupted data structures or future incomplete modification of DriveType definition --- kernel/drivertools.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/kernel/drivertools.h b/kernel/drivertools.h index 079701c35..21b5505d8 100644 --- a/kernel/drivertools.h +++ b/kernel/drivertools.h @@ -364,7 +364,7 @@ public: unsigned int hash() const { - unsigned int inner; + unsigned int inner = 0; switch (type_) { case DriveType::NONE: @@ -385,6 +385,9 @@ public: case DriveType::MULTIPLE: inner = multiple_.hash(); break; + default: + log_assert(0); + break; } return mkhash((unsigned int)type_, inner); } @@ -912,7 +915,7 @@ public: unsigned int hash() const { - unsigned int inner; + unsigned int inner = 0; switch (type_) { case DriveType::NONE: @@ -933,6 +936,9 @@ public: case DriveType::MULTIPLE: inner = multiple_.hash(); break; + default: + log_assert(0); + break; } return mkhash((unsigned int)type_, inner); }