From 02b8a6800cc96fb900941ac9154d066b3fcd565b Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 9 Sep 2024 15:42:07 -0400 Subject: [PATCH] flt.utils.muxer: rename local variable Change-Id: If716499dd9e9f8bf0311fb314919341516823c53 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/13255 Tested-by: jenkins Reviewed-by: Philippe Proulx --- src/plugins/utils/muxer/msg-iter.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/plugins/utils/muxer/msg-iter.cpp b/src/plugins/utils/muxer/msg-iter.cpp index 538d7e4b..0fc9757e 100644 --- a/src/plugins/utils/muxer/msg-iter.cpp +++ b/src/plugins/utils/muxer/msg-iter.cpp @@ -250,14 +250,14 @@ void MsgIter::_validateMsgClkCls(const bt2::ConstMessage msg) } catch (const bt2ccv::ClockCorrelationError& error) { using Type = bt2ccv::ClockCorrelationError::Type; - const auto actualClockCls = error.actualClockCls(); + const auto actualClkCls = error.actualClockCls(); switch (error.type()) { case Type::ExpectingNoClockClassGotOne: BT_CPPLOGE_APPEND_CAUSE_AND_THROW( bt2::Error, "Expecting no clock class, but got one: clock-class-addr={}, clock-class-name={}", - fmt::ptr(actualClockCls->libObjPtr()), actualClockCls->name()); + fmt::ptr(actualClkCls->libObjPtr()), actualClkCls->name()); case Type::ExpectingOriginUnixGotNone: case Type::ExpectingOriginUuidGotNone: @@ -274,7 +274,7 @@ void MsgIter::_validateMsgClkCls(const bt2::ConstMessage msg) bt2::Error, "Expecting a clock class having a Unix epoch origin, but got one not having a Unix " "epoch origin: clock-class-addr={}, clock-class-name={}", - fmt::ptr(actualClockCls->libObjPtr()), actualClockCls->name()); + fmt::ptr(actualClkCls->libObjPtr()), actualClkCls->name()); case Type::ExpectingOriginUuidGotUnix: BT_CPPLOGE_APPEND_CAUSE_AND_THROW( @@ -282,22 +282,22 @@ void MsgIter::_validateMsgClkCls(const bt2::ConstMessage msg) "Expecting a clock class not having a Unix epoch origin, " "but got one having a Unix epoch origin: " "clock-class-addr={}, clock-class-name={}", - fmt::ptr(actualClockCls->libObjPtr()), actualClockCls->name()); + fmt::ptr(actualClkCls->libObjPtr()), actualClkCls->name()); case Type::ExpectingOriginUuidGotNoUuid: BT_CPPLOGE_APPEND_CAUSE_AND_THROW( bt2::Error, "Expecting a clock class with a UUID, but got one without a UUID: " "clock-class-addr={}, clock-class-name={}", - fmt::ptr(actualClockCls->libObjPtr()), actualClockCls->name()); + fmt::ptr(actualClkCls->libObjPtr()), actualClkCls->name()); case Type::ExpectingOriginUuidGotOtherUuid: BT_CPPLOGE_APPEND_CAUSE_AND_THROW( bt2::Error, "Expecting a clock class with a specific UUID, but got one with a different UUID: " "clock-class-addr={}, clock-class-name={}, expected-uuid=\"{}\", uuid=\"{}\"", - fmt::ptr(actualClockCls->libObjPtr()), actualClockCls->name(), - *error.expectedUuid(), *actualClockCls->uuid()); + fmt::ptr(actualClkCls->libObjPtr()), actualClkCls->name(), *error.expectedUuid(), + *actualClkCls->uuid()); case Type::ExpectingOriginNoUuidGotOther: BT_CPPLOGE_APPEND_CAUSE_AND_THROW( @@ -306,7 +306,7 @@ void MsgIter::_validateMsgClkCls(const bt2::ConstMessage msg) "expected-clock-class-addr={}, expected-clock-class-name={}, " "actual-clock-class-addr={}, actual-clock-class-name={}", fmt::ptr(error.expectedClockCls()->libObjPtr()), error.expectedClockCls()->name(), - fmt::ptr(actualClockCls->libObjPtr()), actualClockCls->name()); + fmt::ptr(actualClkCls->libObjPtr()), actualClkCls->name()); } } } -- 2.34.1