[nrf noup] mgmt/MCUmgr/grp/img: Move out label to make compiler happy

de-nordic · jfischer-no · commit 40a0c6ae3fe4 · 2024-03-08T11:57:55.000+01:00
Move it inside ifdef. Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no> (cherry picked from commit 16d6edb)
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
@@ -290,13 +290,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
`@@ -290,13 +290,14 @@ int img_mgmt_get_next_boot_slot(int image, enum img_mgmt_next_boot_type *type)`
`290`	`290`	`return_slot = other_slot;`
`291`	`291`	`}`
`292`	`292`	`}`
	`293`	`+out:`
	`294`	`+`
`293`	`295`	`#else`
`294`	`296`	`if (rcs == 0 && rca == 0 && img_mgmt_vercmp(&aver, &over) < 0) {`
`295`	`297`	`return_slot = other_slot;`
`296`	`298`	`}`
`297`	`299`	`#endif /* defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP_WITH_REVERT) */`
`298`	`300`
`299`		`-out:`
`300`	`301`	`if (type != NULL) {`
`301`	`302`	`*type = lt;`
`302`	`303`	`}`