[ovs-dev] [RFC PATCH 3/9] ovn-nbctl: Pull up releasing IDL from do_nbctl().

Jakub Sitnicki jkbs at redhat.com
Mon Jul 9 18:57:17 UTC 2018


Destroy IDL resources in the routine where we allocated them.

Preparatory work for reusing the main loop in daemon mode.

Signed-off-by: Jakub Sitnicki <jkbs at redhat.com>
---
 ovn/utilities/ovn-nbctl.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ovn/utilities/ovn-nbctl.c b/ovn/utilities/ovn-nbctl.c
index d7784dff1..f1fe594ea 100644
--- a/ovn/utilities/ovn-nbctl.c
+++ b/ovn/utilities/ovn-nbctl.c
@@ -126,6 +126,9 @@ main(int argc, char *argv[])
 
     main_loop(args, commands, n_commands, idl);
 
+    ovsdb_idl_destroy(idl);
+    idl = the_idl = NULL;
+
     for (struct ctl_command *c = commands; c < &commands[n_commands]; c++) {
         ds_destroy(&c->output);
         table_destroy(c->table);
@@ -4305,7 +4308,6 @@ do_nbctl(const char *args, struct ctl_command *commands, size_t n_commands,
     }
 
     ovsdb_idl_txn_destroy(txn);
-    ovsdb_idl_destroy(idl);
 
     return true;
 
-- 
2.14.4



More information about the dev mailing list