From af001e29f972f9226e13b01de04ab5d3a22c1b7f Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 31 May 2023 07:54:10 -0400 Subject: mgmtd: xpath is already NULL in the failure path There is no way that xpath can ever be anything but NULL in the failure path with the goto's. Let's just remove the goto's and return immediately. Signed-off-by: Donald Sharp --- mgmtd/mgmt_txn.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/mgmtd/mgmt_txn.c b/mgmtd/mgmt_txn.c index bf5922433..3d818cb4c 100644 --- a/mgmtd/mgmt_txn.c +++ b/mgmtd/mgmt_txn.c @@ -1022,7 +1022,7 @@ static int mgmt_txn_create_config_batches(struct mgmt_txn_req *txn_req, (void)mgmt_txn_send_commit_cfg_reply( txn_req->txn, MGMTD_INTERNAL_ERROR, "Internal error! Could not get Xpath from Ds node!"); - goto mgmt_txn_create_config_batches_failed; + return -1; } value = (char *)lyd_get_value(chg->cb.dnode); @@ -1130,18 +1130,11 @@ static int mgmt_txn_create_config_batches(struct mgmt_txn_req *txn_req, (void)mgmt_txn_send_commit_cfg_reply( txn_req->txn, MGMTD_NO_CFG_CHANGES, "No changes found to commit!"); - goto mgmt_txn_create_config_batches_failed; + return -1; } cmtcfg_req->next_phase = MGMTD_COMMIT_PHASE_TXN_CREATE; return 0; - -mgmt_txn_create_config_batches_failed: - - if (xpath) - free(xpath); - - return -1; } static int mgmt_txn_prepare_config(struct mgmt_txn_ctx *txn) -- cgit v1.2.3