Resolve comments

project-chip · Jun 4, 2021 · f586231 · f586231
1 parent 2a03c8d
commit f586231
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 20 deletions.
diff --git a/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.cpp b/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.cpp
@@ -169,21 +169,21 @@ bool emberAfMediaPlaybackClusterMediaRewindCallback(chip::app::Command *)
     return true;
 }
 
-bool emberAfMediaPlaybackClusterMediaSkipBackwardCallback(chip::app::Command *, unsigned long long deltaPositionMilliseconds)
+bool emberAfMediaPlaybackClusterMediaSkipBackwardCallback(chip::app::Command *, uint64_t deltaPositionMilliseconds)
 {
     EmberAfMediaPlaybackStatus status = MediaPlaybackManager().proxyMediaPlaybackRequest(MediaPlaybackRequest::SkipBackward);
     sendResponse("MediaSkipBackward", ZCL_MEDIA_SKIP_BACKWARD_RESPONSE_COMMAND_ID, status);
     return true;
 }
 
-bool emberAfMediaPlaybackClusterMediaSkipForwardCallback(chip::app::Command *, unsigned long long deltaPositionMilliseconds)
+bool emberAfMediaPlaybackClusterMediaSkipForwardCallback(chip::app::Command *, uint64_t deltaPositionMilliseconds)
 {
     EmberAfMediaPlaybackStatus status = MediaPlaybackManager().proxyMediaPlaybackRequest(MediaPlaybackRequest::SkipForward);
     sendResponse("MediaSkipForward", ZCL_MEDIA_SKIP_FORWARD_RESPONSE_COMMAND_ID, status);
     return true;
 }
 
-bool emberAfMediaPlaybackClusterMediaSkipSeekCallback(chip::app::Command *, unsigned long long positionMilliseconds)
+bool emberAfMediaPlaybackClusterMediaSkipSeekCallback(chip::app::Command *, uint64_t positionMilliseconds)
 {
     EmberAfMediaPlaybackStatus status = MediaPlaybackManager().proxyMediaPlaybackRequest(MediaPlaybackRequest::Seek);
     sendResponse("MediaSeek", ZCL_MEDIA_SKIP_FORWARD_RESPONSE_COMMAND_ID, status);

diff --git a/src/app/util/af-main-common.cpp b/src/app/util/af-main-common.cpp
@@ -330,8 +330,8 @@ EmberStatus emberAfSendMulticastWithAliasWithCallback(GroupId multicastId, Ember
                                                       uint8_t * message, EmberNodeId alias, uint8_t sequence,
                                                       EmberAfMessageSentFunction callback)
 {
-    apsFrame->groupId                        = multicastId;
-    const MessageSendDestination destination = MessageSendDestination::MulticastWithAlias(multicastId);
+    apsFrame->groupId      = multicastId;
+    const auto destination = MessageSendDestination::MulticastWithAlias(multicastId);
     return send(destination, apsFrame, messageLength, message,
                 true, // broadcast
                 alias, sequence, callback);
@@ -340,8 +340,8 @@ EmberStatus emberAfSendMulticastWithAliasWithCallback(GroupId multicastId, Ember
 EmberStatus emberAfSendMulticastWithCallback(GroupId multicastId, EmberApsFrame * apsFrame, uint16_t messageLength,
                                              uint8_t * message, EmberAfMessageSentFunction callback)
 {
-    apsFrame->groupId                        = multicastId;
-    const MessageSendDestination destination = MessageSendDestination::Multicast(multicastId);
+    apsFrame->groupId      = multicastId;
+    const auto destination = MessageSendDestination::Multicast(multicastId);
     return send(destination, apsFrame, messageLength, message,
                 true, // broadcast?
                 0,    // alias

diff --git a/src/app/util/af-types.h b/src/app/util/af-types.h
@@ -1282,8 +1282,6 @@ class MessageSendDestination
         return MessageSendDestination(VariantViaExchange(exchangeContext));
     }
 
-    std::size_t GetType() const { return mDestination.GetType(); }
-
     bool IsViaBinding() const { return mDestination.Is<VariantViaBinding>(); }
     bool IsDirect() const { return mDestination.Is<VariantDirect>(); }
     bool IsViaExchange() const { return mDestination.Is<VariantViaExchange>(); }

diff --git a/src/lib/support/Variant.h b/src/lib/support/Variant.h
@@ -70,15 +70,6 @@ struct VariantCurry<>
     inline static void Copy(std::size_t that_t, const void * that_v, void * this_v) {}
 };
 
-// Using assert inside template will encoded template name into the assert
-// error message, which cost lots of flash space, this function can strip the
-// type name, and the function name should be as short as possible to save
-// space.
-inline void AssertStrip(bool exp)
-{
-    assert(exp);
-}
-
 } // namespace Internal
 
 /**
@@ -166,14 +157,14 @@ struct Variant
     template <typename T>
     T & Get()
     {
-        Internal::AssertStrip(mTypeId == T::VariantId);
+        VerifyOrDie(mTypeId == T::VariantId);
         return *reinterpret_cast<T *>(&mData);
     }
 
     template <typename T>
     const T & Get() const
     {
-        Internal::AssertStrip(mTypeId == T::VariantId);
+        VerifyOrDie(mTypeId == T::VariantId);
         return *reinterpret_cast<const T *>(&mData);
     }