Fix build of darwin-framework-tool with progress logging disabled. (#…

…26006) * CustomFlowString is used even if progress logging is disabled. * The id variable in GetCommissionerNodeIdCommand was unused when progress logging was disabled.
project-chip · Jul 21, 2023 · e3acfd6 · e3acfd6
1 parent 24a8e8b
commit e3acfd6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/examples/darwin-framework-tool/commands/pairing/GetCommissionerNodeIdCommand.mm b/examples/darwin-framework-tool/commands/pairing/GetCommissionerNodeIdCommand.mm
@@ -25,8 +25,8 @@
     auto * controller = CurrentCommissioner();
     VerifyOrReturnError(nil != controller, CHIP_ERROR_INCORRECT_STATE);
 
-    auto id = [controller.controllerNodeId unsignedLongLongValue];
-    ChipLogProgress(chipTool, "Commissioner Node Id 0x" ChipLogFormatX64, ChipLogValueX64(id));
+    ChipLogProgress(
+        chipTool, "Commissioner Node Id 0x" ChipLogFormatX64, ChipLogValueX64(controller.controllerNodeId.unsignedLongLongValue));
 
     SetCommandExitStatus(CHIP_NO_ERROR);
     return CHIP_NO_ERROR;

diff --git a/examples/darwin-framework-tool/commands/payload/SetupPayloadParseCommand.mm b/examples/darwin-framework-tool/commands/payload/SetupPayloadParseCommand.mm
@@ -24,8 +24,6 @@
 
 namespace {
 
-#if CHIP_PROGRESS_LOGGING
-
 NSString * CustomFlowString(MTRCommissioningFlow flow)
 {
     switch (flow) {
@@ -42,8 +40,6 @@
     return @"???";
 }
 
-#endif // CHIP_PROGRESS_LOGGING
-
 } // namespace
 
 void SetupPayloadParseCommand::LogNSError(const char * logString, NSError * error)