- Replaced the use of char * with MutableCharSpan.

- Removed the use of the VerifyOrExit macro.
- Removed `IsSupportedMapChangeAllowed` check in the `AddSupportedMap` method as adding maps does not compromise any of the other attributes.

Author: hicklin

examples/rvc-app/rvc-common/include/rvc-service-area-delegate.h

@@ -44,13 +44,12 @@ class RvcServiceAreaDelegate : public Delegate
     CHIP_ERROR Init() override;
 
     // command support
-    bool IsSetSelectedLocationsAllowed(char * statusText) override;
+    bool IsSetSelectedLocationsAllowed(MutableCharSpan statusText) override;
 
     bool IsValidSelectLocationsSet(const ServiceArea::Commands::SelectLocations::DecodableType & req,
-                                   ServiceArea::SelectLocationsStatus & locationStatus, char * statusText,
-                                   bool & useStatusText) override;
+                                   ServiceArea::SelectLocationsStatus & locationStatus, MutableCharSpan statusText) override;
 
-    bool HandleSkipCurrentLocation(char * skipStatusText) override;
+    bool HandleSkipCurrentLocation(MutableCharSpan skipStatusText) override;
 
     //*************************************************************************
     // Supported Locations accessors

examples/rvc-app/rvc-common/src/rvc-service-area-delegate.cpp

@@ -18,6 +18,7 @@
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <rvc-service-area-delegate.h>
 
+using namespace chip;
 using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::ServiceArea;
 
@@ -74,14 +75,13 @@ CHIP_ERROR RvcServiceAreaDelegate::Init()
 //*************************************************************************
 // command support
 
-bool RvcServiceAreaDelegate::IsSetSelectedLocationsAllowed(char * statusText)
+bool RvcServiceAreaDelegate::IsSetSelectedLocationsAllowed(MutableCharSpan statusText)
 {
     return true; // TODO IMPLEMENT
 };
 
 bool RvcServiceAreaDelegate::IsValidSelectLocationsSet(const Commands::SelectLocations::DecodableType & req,
-                                                       SelectLocationsStatus & locationStatus, char * statusText,
-                                                       bool & useStatusText)
+                                                       SelectLocationsStatus & locationStatus, MutableCharSpan statusText)
 {
     bool ret_value = false;
 
@@ -90,7 +90,7 @@ bool RvcServiceAreaDelegate::IsValidSelectLocationsSet(const Commands::SelectLoc
     return ret_value;
 };
 
-bool RvcServiceAreaDelegate::HandleSkipCurrentLocation(char * skipStatusText)
+bool RvcServiceAreaDelegate::HandleSkipCurrentLocation(MutableCharSpan skipStatusText)
 {
     bool ret_value = false;
 
@@ -177,23 +177,20 @@ bool RvcServiceAreaDelegate::AddSupportedLocation(const LocationStructureWrapper
 
 bool RvcServiceAreaDelegate::ModifySupportedLocation(uint32_t listIndex, const LocationStructureWrapper & modifiedLocation)
 {
-    bool ret_value = false;
-
     // The server instance (caller) is responsible for ensuring that there are no duplicate location IDs, list size not exceeded,
     // etc.
 
     // Double-check that locationID's match.
-    VerifyOrExit((modifiedLocation.locationID == mSupportedLocations[listIndex].locationID),
-                 ChipLogError(Zcl, "ModifySupportedLocation - new locationID %u does not match existing locationID %u",
-                              modifiedLocation.locationID, mSupportedLocations[listIndex].locationID));
+    if (modifiedLocation.locationID != mSupportedLocations[listIndex].locationID)
+    {
+        ChipLogError(Zcl, "ModifySupportedLocation - locationID's do not match, new locationID %u, existing locationID %u",
+                     modifiedLocation.locationID, mSupportedLocations[listIndex].locationID);
+        return false;
+    }
 
     // checks passed, update the attribute
     mSupportedLocations[listIndex] = modifiedLocation;
-    ret_value                      = true;
-
-exit:
-
-    return ret_value;
+    return true;
 }
 
 bool RvcServiceAreaDelegate::ClearSupportedLocations()
@@ -285,22 +282,19 @@ bool RvcServiceAreaDelegate::AddSupportedMap(const MapStructureWrapper & newMap,
 
 bool RvcServiceAreaDelegate::ModifySupportedMap(uint32_t listIndex, const MapStructureWrapper & modifiedMap)
 {
-    bool ret_value = false;
-
     // The server instance (caller) is responsible for ensuring that there are no duplicate location IDs, list size not exceeded,
     // etc.
 
     // Double-check that mapID's match.
-    VerifyOrExit((modifiedMap.mapID == mSupportedMaps[listIndex].mapID),
-                 ChipLogError(Zcl, "ModifySupportedMap - mapID's do not match, new mapID %u, existing mapID %u", modifiedMap.mapID,
-                              mSupportedMaps[listIndex].mapID));
+    if (modifiedMap.mapID != mSupportedMaps[listIndex].mapID) {
+        ChipLogError(Zcl, "ModifySupportedMap - mapID's do not match, new mapID %u, existing mapID %u", modifiedMap.mapID,
+                     mSupportedMaps[listIndex].mapID);
+        return false;
+    }
 
     // save modified map
     mSupportedMaps[listIndex] = modifiedMap;
-    ret_value                 = true;
-
-exit:
-    return ret_value;
+    return true;
 }
 
 bool RvcServiceAreaDelegate::ClearSupportedMaps()

src/app/clusters/service-area-server/service-area-delegate.h

@@ -67,19 +67,19 @@ class Delegate
     // Command handling support
 
     /**
-     * @brief can the selected locations be set by the client in the current operating mode?
+     * @brief Can the selected locations be set by the client in the current operating mode?
      * @param[out] statusText text describing why selected locations cannot be set (if return is false).
      * @return true if the current device state allows selected locations to be set by user.
      *
      * @note The statusText field SHOULD indicate why the request is not allowed, given the current mode
      *       of the device, which may involve other clusters.
      */
-    virtual bool IsSetSelectedLocationsAllowed(char * statusText) = 0;
+    virtual bool IsSetSelectedLocationsAllowed(MutableCharSpan statusText) = 0;
 
     /**
      * Given a set of locations to be set to the SelectedLocations attribute, this method should check that:
-     *  - There are no duplicates in the list. If there are duplicates, the locationStatus should be set to
-     *     DuplicatedLocations and the statusText should be an empty string.
+     *  - There are no duplicates in the list. If there are duplicates, the locationStatus SHALL be set to
+     *     DuplicatedLocations and the statusText SHALL be an empty string.
      *  - The set of locations as a whole is valid and reachable by the device. If the set of locations is invalid,
      *     the locationStatus should be set to InvalidSet and the statusText SHALL include a vendor-defined error description.
      *
@@ -89,14 +89,13 @@ class Delegate
      * @param[out] locationStatus Success if all checks pass, error code if failure.
      * @param[out] statusText text describing failure (see description above), size kMaxSizeStatusText + 1 byte for terminating
      * character.
-     * @param[out] useStatusText if true, the statusText value should be returned in the command response.
      * @return true if success.
      *
      * @note If the SelectLocations command is allowed when the device is operating and the selected locations change to none, the
      * device must stop.
      */
     virtual bool IsValidSelectLocationsSet(const Commands::SelectLocations::DecodableType & req,
-                                           SelectLocationsStatus & locationStatus, char * statusText, bool & useStatusText) = 0;
+                                           SelectLocationsStatus & locationStatus, MutableCharSpan statusText) = 0;
 
     /**
      * @brief The server instance ensures that the SelectedLocations and CurrentLocation attributes are not null before
@@ -124,10 +123,10 @@ class Delegate
      * InvalidInMode, the StatusText field SHOULD indicate why the request is not allowed, given the current mode of the device,
      * which may involve other clusters.
      */
-    virtual bool HandleSkipCurrentLocation(char * skipStatusText)
+    virtual bool HandleSkipCurrentLocation(MutableCharSpan skipStatusText)
     {
         // device support of this command is optional
-        strncat(skipStatusText, "Skip Current Location command not supported by device", kMaxSizeStatusText);
+        chip::CopyCharSpanToMutableCharSpan("Skip Current Location command not supported by device"_span, skipStatusText);
         return false;
     }