Bluetooth: Mesh: Avoid dead code in access

PavelVPV · nashif · commit 24bd211d7709 · 2023-06-02T18:57:14.000-04:00
Use if-else-endif construction to avoid dead code. Coverity-CID: 316484, GitHub issue #58539 Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
diff --git a/subsys/bluetooth/mesh/access.c b/subsys/bluetooth/mesh/access.c
@@ -2105,10 +2105,11 @@ void bt_mesh_comp_data_clear(void)
 
 int bt_mesh_models_metadata_change_prepare(void)
 {
-#if !IS_ENABLED(CONFIG_BT_MESH_LARGE_COMP_DATA_SRV)
+#if IS_ENABLED(CONFIG_BT_MESH_LARGE_COMP_DATA_SRV)
+	return bt_mesh_models_metadata_store();
+#else
 	return -ENOTSUP;
 #endif
-	return bt_mesh_models_metadata_store();
 }
 
 static void commit_mod(struct bt_mesh_model *mod, struct bt_mesh_elem *elem,

Original file line number	Diff line number	Diff line change
`@@ -2105,10 +2105,11 @@ void bt_mesh_comp_data_clear(void)`
`2105`	`2105`
`2106`	`2106`	`int bt_mesh_models_metadata_change_prepare(void)`
`2107`	`2107`	`{`
`2108`		`-#if !IS_ENABLED(CONFIG_BT_MESH_LARGE_COMP_DATA_SRV)`
	`2108`	`+#if IS_ENABLED(CONFIG_BT_MESH_LARGE_COMP_DATA_SRV)`
	`2109`	`+ return bt_mesh_models_metadata_store();`
	`2110`	`+#else`
`2109`	`2111`	`return -ENOTSUP;`
`2110`	`2112`	`#endif`
`2111`		`- return bt_mesh_models_metadata_store();`
`2112`	`2113`	`}`
`2113`	`2114`
`2114`	`2115`	`static void commit_mod(struct bt_mesh_model mod, struct bt_mesh_elem elem,`