Bluetooth: controller: Fix Coverity unreachable code

carlescufi · Anas Nashif · commit b276eeabc754 · 2017-09-04T06:06:29.000-04:00
CID: 175182

Use #else to avoid Coverity warning about unreachable code.

Signed-off-by: Carles Cufi &lt;carles.cufi@nordicsemi.no&gt;
diff --git a/subsys/bluetooth/controller/hci/hci.c b/subsys/bluetooth/controller/hci/hci.c
@@ -1672,12 +1672,12 @@ static void vs_read_key_hierarchy_roots(struct net_buf *buf,
 	}
 
 	return;
-#endif /* CONFIG_SOC_FAMILY_NRF5 */
-
+#else
 	/* Mark IR as invalid */
 	memset(rp->ir, 0x00, sizeof(rp->ir));
 	/* Mark ER as invalid */
 	memset(rp->er, 0x00, sizeof(rp->er));
+#endif /* CONFIG_SOC_FAMILY_NRF5 */
 }
 
 #endif /* CONFIG_BT_CTLR_HCI_VS_EXT */

Original file line number	Diff line number	Diff line change
`@@ -1672,12 +1672,12 @@ static void vs_read_key_hierarchy_roots(struct net_buf *buf,`
`1672`	`1672`	`}`
`1673`	`1673`
`1674`	`1674`	`return;`
`1675`		`-#endif /* CONFIG_SOC_FAMILY_NRF5 */`
`1676`		`-`
	`1675`	`+#else`
`1677`	`1676`	`/* Mark IR as invalid */`
`1678`	`1677`	`memset(rp->ir, 0x00, sizeof(rp->ir));`
`1679`	`1678`	`/* Mark ER as invalid */`
`1680`	`1679`	`memset(rp->er, 0x00, sizeof(rp->er));`
	`1680`	`+#endif /* CONFIG_SOC_FAMILY_NRF5 */`
`1681`	`1681`	`}`
`1682`	`1682`
`1683`	`1683`	`#endif /* CONFIG_BT_CTLR_HCI_VS_EXT */`