From 3c0679991df009fe0a9b8d80995ea233c796f5c8 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Sat, 15 Feb 2025 17:21:33 +0100 Subject: [PATCH] confd: bridge: Refactor init_snippets() to avoid unreachable code Fix coverity CID 464653 --- src/confd/src/infix-if-bridge.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/confd/src/infix-if-bridge.c b/src/confd/src/infix-if-bridge.c index 3f8d3278..55ffaf85 100644 --- a/src/confd/src/infix-if-bridge.c +++ b/src/confd/src/infix-if-bridge.c @@ -426,10 +426,8 @@ static int init_snippets(struct ixif_br *br, struct lyd_node *dif, struct lyd_no br->cif = cif; br->ip = ip; - err = snippet_open(&br->bropts); - if (err) - goto err; + err = snippet_open(&br->bropts); err = err ? : snippet_open(&br->init.vlan); err = err ? : snippet_open(&br->init.mcast); err = err ? : snippet_open(&br->init.mdb); @@ -443,15 +441,11 @@ static int init_snippets(struct ixif_br *br, struct lyd_node *dif, struct lyd_no snippet_close(&br->init.mdb, NULL); snippet_close(&br->init.mcast, NULL); snippet_close(&br->init.vlan, NULL); - goto err_close_bropts; + snippet_close(&br->bropts, NULL); + return err; } return 0; - -err_close_bropts: - snippet_close(&br->bropts, NULL); -err: - return err; } static int collect_snippets(struct ixif_br *br)