Skip to content

Commit

Permalink
Use PRIu32 instead of %u to print unsigned integer (project-chip#35069)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jadhavrohit924 @PeterC1965
jadhavrohit924 authored and PeterC1965 committed Aug 28, 2024
1 parent 3c2b14a commit 7eaed4a
Showing 1 changed file with 35 additions and 32 deletions.
67 changes: 35 additions & 32 deletions src/app/clusters/service-area-server/service-area-server.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ void Instance::HandleSkipAreaCmd(HandlerContext & ctx, const Commands::SkipArea:
// If the Status field is set to InvalidAreaList, the StatusText field SHALL be an empty string.
if (!IsSupportedArea(req.skippedArea))
{
ChipLogError(Zcl, "SkippedArea (%u) is not in the SupportedAreas attribute.", req.skippedArea);
ChipLogError(Zcl, "SkippedArea (%" PRIu32 ") is not in the SupportedAreas attribute.", req.skippedArea);
exitResponse(SkipAreaStatus::kInvalidAreaList, ""_span);
return;
}
Expand Down Expand Up @@ -453,7 +453,7 @@ bool Instance::IsValidSupportedArea(const AreaStructureWrapper & aArea)
// If the LandmarkInfo field is null, the LocationInfo field SHALL NOT be null.
if (aArea.areaDesc.locationInfo.IsNull() && aArea.areaDesc.landmarkInfo.IsNull())
{
ChipLogDetail(Zcl, "IsValidAsSupportedArea %u - must have locationInfo and/or LandmarkInfo", aArea.areaID);
ChipLogDetail(Zcl, "IsValidAsSupportedArea %" PRIu32 " - must have locationInfo and/or LandmarkInfo", aArea.areaID);
return false;
}

Expand All @@ -464,8 +464,9 @@ bool Instance::IsValidSupportedArea(const AreaStructureWrapper & aArea)
if (aArea.areaDesc.locationInfo.Value().locationName.empty() && aArea.areaDesc.locationInfo.Value().floorNumber.IsNull() &&
aArea.areaDesc.locationInfo.Value().areaType.IsNull() && aArea.areaDesc.landmarkInfo.IsNull())
{
ChipLogDetail(Zcl, "IsValidAsSupportedArea %u - AreaName is empty string, FloorNumber, AreaType, LandmarkInfo are null",
aArea.areaID);
ChipLogDetail(
Zcl, "IsValidAsSupportedArea %" PRIu32 " - AreaName is empty string, FloorNumber, AreaType, LandmarkInfo are null",
aArea.areaID);
return false;
}
}
Expand All @@ -475,14 +476,15 @@ bool Instance::IsValidSupportedArea(const AreaStructureWrapper & aArea)
{
if (aArea.mapID.IsNull())
{
ChipLogDetail(Zcl, "IsValidSupportedArea %u - map Id should not be null when there are supported maps", aArea.areaID);
ChipLogDetail(Zcl, "IsValidSupportedArea %" PRIu32 " - map Id should not be null when there are supported maps",
aArea.areaID);
return false;
}

// If the SupportedMaps attribute is not null, mapID SHALL be the ID of an entry from the SupportedMaps attribute.
if (!IsSupportedMap(aArea.mapID.Value()))
{
ChipLogError(Zcl, "IsValidSupportedArea %u - map Id %u is not in supported map list", aArea.areaID,
ChipLogError(Zcl, "IsValidSupportedArea %" PRIu32 " - map Id %" PRIu32 " is not in supported map list", aArea.areaID,
aArea.mapID.Value());
return false;
}
Expand All @@ -491,8 +493,8 @@ bool Instance::IsValidSupportedArea(const AreaStructureWrapper & aArea)
{
if (!aArea.mapID.IsNull())
{
ChipLogDetail(Zcl, "IsValidSupportedArea %u - map Id %u is not in empty supported map list", aArea.areaID,
aArea.mapID.Value());
ChipLogDetail(Zcl, "IsValidSupportedArea %" PRIu32 " - map Id %" PRIu32 " is not in empty supported map list",
aArea.areaID, aArea.mapID.Value());
return false;
}
}
Expand Down Expand Up @@ -578,14 +580,14 @@ bool Instance::AddSupportedArea(AreaStructureWrapper & aNewArea)
// Check there is space for the entry.
if (mDelegate->GetNumberOfSupportedAreas() >= kMaxNumSupportedAreas)
{
ChipLogError(Zcl, "AddSupportedArea %u - too many entries", aNewArea.areaID);
ChipLogError(Zcl, "AddSupportedArea %" PRIu32 " - too many entries", aNewArea.areaID);
return false;
}

// Verify cluster requirements concerning valid fields and field relationships.
if (!IsValidSupportedArea(aNewArea))
{
ChipLogError(Zcl, "AddSupportedArea %u - not a valid location object", aNewArea.areaID);
ChipLogError(Zcl, "AddSupportedArea %" PRIu32 " - not a valid location object", aNewArea.areaID);
return false;
}

Expand All @@ -595,7 +597,7 @@ bool Instance::AddSupportedArea(AreaStructureWrapper & aNewArea)
// the AreaInfo field.
if (!IsUniqueSupportedArea(aNewArea, false))
{
ChipLogError(Zcl, "AddSupportedArea %u - not a unique location object", aNewArea.areaID);
ChipLogError(Zcl, "AddSupportedArea %" PRIu32 " - not a unique location object", aNewArea.areaID);
return false;
}

Expand All @@ -619,7 +621,7 @@ bool Instance::ModifySupportedArea(AreaStructureWrapper & aNewArea)
AreaStructureWrapper supportedArea;
if (!mDelegate->GetSupportedAreaById(aNewArea.areaID, listIndex, supportedArea))
{
ChipLogError(Zcl, "ModifySupportedArea %u - not a supported areaID", aNewArea.areaID);
ChipLogError(Zcl, "ModifySupportedArea %" PRIu32 " - not a supported areaID", aNewArea.areaID);
return false;
}

Expand All @@ -639,15 +641,15 @@ bool Instance::ModifySupportedArea(AreaStructureWrapper & aNewArea)
// verify cluster requirements concerning valid fields and field relationships
if (!IsValidSupportedArea(aNewArea))
{
ChipLogError(Zcl, "ModifySupportedArea %u - not a valid location object", aNewArea.areaID);
ChipLogError(Zcl, "ModifySupportedArea %" PRIu32 " - not a valid location object", aNewArea.areaID);
return false;
}

// Updated location description must not match another existing location description.
// We ignore comparing the area ID as one of the locations will match this one.
if (!IsUniqueSupportedArea(aNewArea, true))
{
ChipLogError(Zcl, "ModifySupportedArea %u - not a unique location object", aNewArea.areaID);
ChipLogError(Zcl, "ModifySupportedArea %" PRIu32 " - not a unique location object", aNewArea.areaID);
return false;
}

Expand Down Expand Up @@ -701,14 +703,14 @@ bool Instance::AddSupportedMap(uint32_t aMapId, const CharSpan & aMapName)
// check max# of list entries
if (mDelegate->GetNumberOfSupportedMaps() >= kMaxNumSupportedMaps)
{
ChipLogError(Zcl, "AddSupportedMap %u - maximum number of entries", aMapId);
ChipLogError(Zcl, "AddSupportedMap %" PRIu32 " - maximum number of entries", aMapId);
return false;
}

// Map name SHALL include readable text that describes the map name (cannot be empty string).
if (aMapName.empty())
{
ChipLogError(Zcl, "AddSupportedMap %u - Name must not be empty string", aMapId);
ChipLogError(Zcl, "AddSupportedMap %" PRIu32 " - Name must not be empty string", aMapId);
return false;
}

Expand All @@ -721,15 +723,15 @@ bool Instance::AddSupportedMap(uint32_t aMapId, const CharSpan & aMapName)
// the name cannot be the same as an existing map
if (entry.IsNameEqual(aMapName))
{
ChipLogError(Zcl, "AddSupportedMap %u - A map already exists with same name '%.*s'", aMapId,
ChipLogError(Zcl, "AddSupportedMap %" PRIu32 " - A map already exists with same name '%.*s'", aMapId,
static_cast<int>(entry.GetName().size()), entry.GetName().data());
return false;
}

// Each entry in this list SHALL have a unique value for the MapID field.
if (aMapId == entry.mapID)
{
ChipLogError(Zcl, "AddSupportedMap - non-unique Id %u", aMapId);
ChipLogError(Zcl, "AddSupportedMap - non-unique Id %" PRIu32 "", aMapId);
return false;
}
}
Expand Down Expand Up @@ -757,14 +759,14 @@ bool Instance::RenameSupportedMap(uint32_t aMapId, const CharSpan & newMapName)
// get existing entry
if (!mDelegate->GetSupportedMapById(aMapId, modifiedIndex, modifiedMap))
{
ChipLogError(Zcl, "RenameSupportedMap Id %u - map does not exist", aMapId);
ChipLogError(Zcl, "RenameSupportedMap Id %" PRIu32 " - map does not exist", aMapId);
return false;
}

// Map name SHALL include readable text that describes the map's name. It cannot be empty string.
if (newMapName.empty())
{
ChipLogError(Zcl, "RenameSupportedMap %u - Name must not be empty string", aMapId);
ChipLogError(Zcl, "RenameSupportedMap %" PRIu32 " - Name must not be empty string", aMapId);
return false;
}

Expand All @@ -784,7 +786,7 @@ bool Instance::RenameSupportedMap(uint32_t aMapId, const CharSpan & newMapName)

if (entry.IsNameEqual(newMapName))
{
ChipLogError(Zcl, "RenameSupportedMap %u - map already exists with same name '%.*s'", aMapId,
ChipLogError(Zcl, "RenameSupportedMap %" PRIu32 " - map already exists with same name '%.*s'", aMapId,
static_cast<int>(entry.GetName().size()), entry.GetName().data());
return false;
}
Expand Down Expand Up @@ -828,21 +830,21 @@ bool Instance::AddSelectedArea(uint32_t & aSelectedArea)
// check max# of list entries
if (mDelegate->GetNumberOfSelectedAreas() >= kMaxNumSelectedAreas)
{
ChipLogError(Zcl, "AddSelectedArea %u - maximum number of entries", aSelectedArea);
ChipLogError(Zcl, "AddSelectedArea %" PRIu32 " - maximum number of entries", aSelectedArea);
return false;
}

// each item in this list SHALL match the AreaID field of an entry on the SupportedAreas attribute's list
if (!IsSupportedArea(aSelectedArea))
{
ChipLogError(Zcl, "AddSelectedArea %u - not a supported location", aSelectedArea);
ChipLogError(Zcl, "AddSelectedArea %" PRIu32 " - not a supported location", aSelectedArea);
return false;
}

// each entry in this list SHALL have a unique value
if (mDelegate->IsSelectedArea(aSelectedArea))
{
ChipLogError(Zcl, "AddSelectedArea %u - duplicated location", aSelectedArea);
ChipLogError(Zcl, "AddSelectedArea %" PRIu32 " - duplicated location", aSelectedArea);
return false;
}

Expand All @@ -852,7 +854,7 @@ bool Instance::AddSelectedArea(uint32_t & aSelectedArea)

if (!mDelegate->IsSetSelectedAreasAllowed(locationStatusText))
{
ChipLogError(Zcl, "AddSelectedArea %u - %.*s", aSelectedArea, static_cast<int>(locationStatusText.size()),
ChipLogError(Zcl, "AddSelectedArea %" PRIu32 " - %.*s", aSelectedArea, static_cast<int>(locationStatusText.size()),
locationStatusText.data());
return false;
}
Expand Down Expand Up @@ -886,7 +888,7 @@ bool Instance::SetCurrentArea(const DataModel::Nullable<uint32_t> & aCurrentArea
// list.
if ((!aCurrentArea.IsNull()) && (!IsSupportedArea(aCurrentArea.Value())))
{
ChipLogError(Zcl, "SetCurrentArea %u - location is not supported", aCurrentArea.Value());
ChipLogError(Zcl, "SetCurrentArea %" PRIu32 " - location is not supported", aCurrentArea.Value());
return false;
}

Expand Down Expand Up @@ -955,14 +957,14 @@ bool Instance::AddPendingProgressElement(uint32_t aAreaId)
// For each entry in this list, the AreaID field SHALL match an entry on the SupportedAreas attribute's list.
if (!IsSupportedArea(aAreaId))
{
ChipLogError(Zcl, "AddPendingProgressElement - not a supported location %u", aAreaId);
ChipLogError(Zcl, "AddPendingProgressElement - not a supported location %" PRIu32 "", aAreaId);
return false;
}

// Each entry in this list SHALL have a unique value for the AreaID field.
if (mDelegate->IsProgressElement(aAreaId))
{
ChipLogError(Zcl, "AddPendingProgressElement - progress element already exists for location %u", aAreaId);
ChipLogError(Zcl, "AddPendingProgressElement - progress element already exists for location %" PRIu32 "", aAreaId);
return false;
}

Expand All @@ -984,7 +986,7 @@ bool Instance::SetProgressStatus(uint32_t aAreaId, OperationalStatusEnum opStatu

if (!mDelegate->GetProgressElementById(aAreaId, listIndex, progressElement))
{
ChipLogError(Zcl, "SetProgressStatus - progress element does not exist for location %u", aAreaId);
ChipLogError(Zcl, "SetProgressStatus - progress element does not exist for location %" PRIu32 "", aAreaId);
return false;
}

Expand Down Expand Up @@ -1020,7 +1022,7 @@ bool Instance::SetProgressTotalOperationalTime(uint32_t aAreaId, const DataModel

if (!mDelegate->GetProgressElementById(aAreaId, listIndex, progressElement))
{
ChipLogError(Zcl, "SetProgressTotalOperationalTime - progress element does not exist for location %u", aAreaId);
ChipLogError(Zcl, "SetProgressTotalOperationalTime - progress element does not exist for location %" PRIu32 "", aAreaId);
return false;
}

Expand All @@ -1036,7 +1038,8 @@ bool Instance::SetProgressTotalOperationalTime(uint32_t aAreaId, const DataModel
!aTotalOperationalTime.IsNull())
{
ChipLogError(Zcl,
"SetProgressTotalOperationalTime - location %u opStatus value %u - can be non-null only if opStatus is "
"SetProgressTotalOperationalTime - location %" PRIu32
" opStatus value %u - can be non-null only if opStatus is "
"Completed or Skipped",
aAreaId, to_underlying(progressElement.status));
return false;
Expand All @@ -1062,7 +1065,7 @@ bool Instance::SetProgressEstimatedTime(uint32_t aAreaId, const DataModel::Nulla

if (!mDelegate->GetProgressElementById(aAreaId, listIndex, progressElement))
{
ChipLogError(Zcl, "SetProgressEstimatedTime - progress element does not exist for location %u", aAreaId);
ChipLogError(Zcl, "SetProgressEstimatedTime - progress element does not exist for location %" PRIu32 "", aAreaId);
return false;
}

Expand Down

0 comments on commit 7eaed4a

Please sign in to comment.