mgmt: mcumgr: grp: img_mgmt: Fix unused label warning

nordicjm · kartben · commit c562cbc28493 · 2025-01-21T11:11:51.000+01:00
Fixes an issue with a warning when compiling for direct xip mode
without revert

Signed-off-by: Jamie McCrae &lt;jamie.mccrae@nordicsemi.no&gt;
diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
@@ -285,13 +285,14 @@ int img_mgmt_get_next_boot_slot(int image, enum img_mgmt_next_boot_type *type)
 			return_slot = other_slot;
 		}
 	}
+
+out:
 #else
 	if (rcs == 0 && rca == 0 && img_mgmt_vercmp(&aver, &over) < 0) {
 		return_slot = other_slot;
 	}
 #endif /* defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP_WITH_REVERT) */
 
-out:
 	if (type != NULL) {
 		*type = lt;
 	}

Original file line number	Diff line number	Diff line change
`@@ -285,13 +285,14 @@ int img_mgmt_get_next_boot_slot(int image, enum img_mgmt_next_boot_type *type)`
`285`	`285`	`return_slot = other_slot;`
`286`	`286`	`}`
`287`	`287`	`}`
	`288`	`+`
	`289`	`+out:`
`288`	`290`	`#else`
`289`	`291`	`if (rcs == 0 && rca == 0 && img_mgmt_vercmp(&aver, &over) < 0) {`
`290`	`292`	`return_slot = other_slot;`
`291`	`293`	`}`
`292`	`294`	`#endif /* defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP_WITH_REVERT) */`
`293`	`295`
`294`		`-out:`
`295`	`296`	`if (type != NULL) {`
`296`	`297`	`*type = lt;`
`297`	`298`	`}`