From ca43bcca908f0eaff64df0d61d71ad1a44c1f498 Mon Sep 17 00:00:00 2001
From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Thu, 16 May 2024 11:37:58 -0400
Subject: [PATCH] bt2c/logging.hpp: replace `Logger::MemData` with `ConstBytes`

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Iad923b8d42256fe02a9c3300045201776bfc0c4e
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12767
---
 src/cpp-common/bt2c/logging.hpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/cpp-common/bt2c/logging.hpp b/src/cpp-common/bt2c/logging.hpp
index bda68740..347063ab 100644
--- a/src/cpp-common/bt2c/logging.hpp
+++ b/src/cpp-common/bt2c/logging.hpp
@@ -22,11 +22,11 @@
 #include "cpp-common/bt2/self-component-port.hpp"
 #include "cpp-common/bt2/self-message-iterator.hpp"
 #include "cpp-common/bt2s/optional.hpp"
-#include "cpp-common/bt2s/span.hpp"
 #include "cpp-common/vendor/fmt/core.h"
 #include "cpp-common/vendor/wise-enum/wise_enum.h"
 #include "logging/log-api.h"
 
+#include "aliases.hpp"
 #include "text-loc-str.hpp"
 
 namespace bt2c {
@@ -71,8 +71,6 @@ namespace bt2c {
 class Logger final
 {
 public:
-    using MemData = bt2s::span<const std::uint8_t>;
-
     /* clang-format off */
 
     /* Available log levels */
@@ -317,8 +315,8 @@ private:
     struct _StdLogWriter final
     {
         static void write(const char * const fileName, const char * const funcName,
-                          const unsigned lineNo, const Level level, const char * const tag, MemData,
-                          const char * const initMsg, const char * const msg) noexcept
+                          const unsigned lineNo, const Level level, const char * const tag,
+                          ConstBytes, const char * const initMsg, const char * const msg) noexcept
         {
             BT_ASSERT_DBG(initMsg && std::strcmp(initMsg, "") == 0);
             bt_log_write(fileName, funcName, lineNo, static_cast<bt_log_level>(level), tag, msg);
@@ -374,8 +372,8 @@ private:
     struct _InitMsgLogWriter final
     {
         static void write(const char * const fileName, const char * const funcName,
-                          const unsigned lineNo, const Level level, const char * const tag, MemData,
-                          const char * const initMsg, const char * const msg) noexcept
+                          const unsigned lineNo, const Level level, const char * const tag,
+                          ConstBytes, const char * const initMsg, const char * const msg) noexcept
         {
             bt_log_write_printf(funcName, fileName, lineNo, static_cast<bt_log_level>(level), tag,
                                 "%s%s", initMsg, msg);
@@ -490,7 +488,7 @@ private:
     {
         static void write(const char * const fileName, const char * const funcName,
                           const unsigned lineNo, const Level level, const char * const tag,
-                          const MemData memData, const char *, const char * const msg) noexcept
+                          const ConstBytes memData, const char *, const char * const msg) noexcept
         {
             bt_log_write_mem(funcName, fileName, lineNo, static_cast<bt_log_level>(level), tag,
                              memData.data(), memData.size(), msg);
@@ -506,7 +504,7 @@ public:
      */
     template <Level LevelV, typename... ArgTs>
     void logMem(const char * const fileName, const char * const funcName, const unsigned int lineNo,
-                const MemData memData, fmt::format_string<ArgTs...> fmt, ArgTs&&...args) const
+                const ConstBytes memData, fmt::format_string<ArgTs...> fmt, ArgTs&&...args) const
     {
         this->_log<_MemLogWriter, LevelV, false>(fileName, funcName, lineNo, memData, "",
                                                  std::move(fmt), std::forward<ArgTs>(args)...);
@@ -526,8 +524,8 @@ private:
      */
     template <typename LogWriterT, Level LevelV, bool AppendCauseV, typename... ArgTs>
     void _log(const char * const fileName, const char * const funcName, const unsigned int lineNo,
-              const MemData memData, const char * const initMsg, fmt::format_string<ArgTs...> fmt,
-              ArgTs&&...args) const
+              const ConstBytes memData, const char * const initMsg,
+              fmt::format_string<ArgTs...> fmt, ArgTs&&...args) const
     {
         const auto wouldLog = this->wouldLog(LevelV);
 
-- 
2.34.1