From 58828b0ce9556ee9cb38c484d1226663a0dcd993 Mon Sep 17 00:00:00 2001 From: Billy Donahue Date: Wed, 9 Sep 2020 21:32:04 +0000 Subject: SERVER-43909 clarify and repair util/hex.h API - hexblob namespace - Throwy hexblob::decode (nee fromHex) - StringData overloads of hex codec ops - add unsignedHex and zeroPaddedHex --- src/mongo/watchdog/watchdog.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/mongo/watchdog') diff --git a/src/mongo/watchdog/watchdog.cpp b/src/mongo/watchdog/watchdog.cpp index 4142dc3a8ba..ec3253d805e 100644 --- a/src/mongo/watchdog/watchdog.cpp +++ b/src/mongo/watchdog/watchdog.cpp @@ -430,10 +430,9 @@ void checkFile(OperationContext* opCtx, const boost::filesystem::path& file) { "'{toHexLower_readBuffer_get_bytesRead}'", "file_generic_string"_attr = file.generic_string(), "nowStr_size"_attr = nowStr.size(), - "toHexLower_nowStr_c_str_nowStr_size"_attr = - toHexLower(nowStr.c_str(), nowStr.size()), + "toHexLower_nowStr_c_str_nowStr_size"_attr = hexblob::encodeLower(nowStr), "toHexLower_readBuffer_get_bytesRead"_attr = - toHexLower(readBuffer.get(), bytesRead)); + hexblob::encodeLower(readBuffer.get(), bytesRead)); } } @@ -562,9 +561,9 @@ void checkFile(OperationContext* opCtx, const boost::filesystem::path& file) { "'{toHexLower_readBuffer_get_bytesReadTotal}'", "file_generic_string"_attr = file.generic_string(), "nowStr_size"_attr = nowStr.size(), - "toHexLower_nowStr_c_str_nowStr_size"_attr = toHexLower(nowStr.c_str(), nowStr.size()), + "toHexLower_nowStr_c_str_nowStr_size"_attr = hexblob::encodeLower(nowStr), "toHexLower_readBuffer_get_bytesReadTotal"_attr = - toHexLower(readBuffer.get(), bytesReadTotal)); + hexblob::encodeLower(readBuffer.get(), bytesReadTotal)); } if (close(fd)) { -- cgit v1.2.1