From 832d0b0cb704a48dee302c617177192eb740cf9e Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Fri, 26 Sep 2025 11:47:12 -0400
Subject: [PATCH] Refactor hex formatting in utility functions for consistency

- Removed static format strings in HexByte, HexWord, HexLong, and HexLongLong functions.
- Replaced them with direct format specifiers in absl::StrFormat calls to enhance code clarity and reduce redundancy.
---
 src/util/hex.cc | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/util/hex.cc b/src/util/hex.cc
index 729c3551..8f910f94 100644
--- a/src/util/hex.cc
+++ b/src/util/hex.cc
@@ -29,12 +29,10 @@ void HandleHexStringParams(std::string &hex, const HexStringParams &params) {
 
 std::string HexByte(uint8_t byte, HexStringParams params) {
   std::string result;
-  const static std::string kLowerFormat = "%02x";
-  const static std::string kUpperFormat = "%02X";
   if (params.uppercase) {
-    result = absl::StrFormat(kUpperFormat.c_str(), byte);
+    result = absl::StrFormat("%02X", byte);
   } else {
-    result = absl::StrFormat(kLowerFormat.c_str(), byte);
+    result = absl::StrFormat("%02x", byte);
   }
   HandleHexStringParams(result, params);
   return result;
@@ -42,12 +40,10 @@ std::string HexByte(uint8_t byte, HexStringParams params) {
 
 std::string HexWord(uint16_t word, HexStringParams params) {
   std::string result;
-  const static std::string kLowerFormat = "%04x";
-  const static std::string kUpperFormat = "%04X";
   if (params.uppercase) {
-    result = absl::StrFormat(kUpperFormat.c_str(), word);
+    result = absl::StrFormat("%04X", word);
   } else {
-    result = absl::StrFormat(kLowerFormat.c_str(), word);
+    result = absl::StrFormat("%04x", word);
   }
   HandleHexStringParams(result, params);
   return result;
@@ -55,12 +51,10 @@ std::string HexWord(uint16_t word, HexStringParams params) {
 
 std::string HexLong(uint32_t dword, HexStringParams params) {
   std::string result;
-  const static std::string kLowerFormat = "%06x";
-  const static std::string kUpperFormat = "%06X";
   if (params.uppercase) {
-    result = absl::StrFormat(kUpperFormat.c_str(), dword);
+    result = absl::StrFormat("%06X", dword);
   } else {
-    result = absl::StrFormat(kLowerFormat.c_str(), dword);
+    result = absl::StrFormat("%06x", dword);
   }
   HandleHexStringParams(result, params);
   return result;
@@ -68,12 +62,10 @@ std::string HexLong(uint32_t dword, HexStringParams params) {
 
 std::string HexLongLong(uint64_t qword, HexStringParams params) {
   std::string result;
-  const static std::string kLowerFormat = "%08x";
-  const static std::string kUpperFormat = "%08X";
   if (params.uppercase) {
-    result = absl::StrFormat(kUpperFormat.c_str(), qword);
+    result = absl::StrFormat("%08X", qword);
   } else {
-    result = absl::StrFormat(kLowerFormat.c_str(), qword);
+    result = absl::StrFormat("%08x", qword);
   }
   HandleHexStringParams(result, params);
   return result;