diff mbox series

[ovs-dev,2.12,3/4] extend-table.c: Refactor code.

Message ID 1576957867-69488-4-git-send-email-hzhou@ovn.org
State Accepted
Commit 64941134b7888debc3ca855bfdcd3f711c08d6ff
Headers show
Series Fix reusing meter/group by multiple logical flows. | expand

Commit Message

Han Zhou Dec. 21, 2019, 7:51 p.m. UTC 
Reuse xxx_clear() function in xxx_destroy() and remove redundant code.

Acked-by: Dumitru Ceara <dceara@redhat.com>
Signed-off-by: Han Zhou <hzhou@ovn.org>
---
 ovn/lib/extend-table.c | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)
diff mbox series

Patch

diff --git a/ovn/lib/extend-table.c b/ovn/lib/extend-table.c
index ccf70ca..3263da8 100644
--- a/ovn/lib/extend-table.c
+++ b/ovn/lib/extend-table.c
@@ -34,27 +34,6 @@  ovn_extend_table_init(struct ovn_extend_table *table)
     hmap_init(&table->existing);
 }
 
-static void
-ovn_extend_table_info_destroy(struct hmap *target)
-{
-    struct ovn_extend_table_info *e, *next;
-    HMAP_FOR_EACH_SAFE (e, next, hmap_node, target) {
-        hmap_remove(target, &e->hmap_node);
-        free(e->name);
-        free(e);
-    }
-    hmap_destroy(target);
-}
-
-void
-ovn_extend_table_destroy(struct ovn_extend_table *table)
-{
-    bitmap_free(table->table_ids);
-
-    ovn_extend_table_info_destroy(&table->desired);
-    ovn_extend_table_info_destroy(&table->existing);
-}
-
 /* Finds and returns a group_info in 'existing' whose key is identical
  * to 'target''s key, or NULL if there is none. */
 struct ovn_extend_table_info *
@@ -91,6 +70,16 @@  ovn_extend_table_clear(struct ovn_extend_table *table, bool existing)
     }
 }
 
+void
+ovn_extend_table_destroy(struct ovn_extend_table *table)
+{
+    ovn_extend_table_clear(table, false);
+    hmap_destroy(&table->desired);
+    ovn_extend_table_clear(table, true);
+    hmap_destroy(&table->existing);
+    bitmap_free(table->table_ids);
+}
+
 /* Remove an entry from existing table */
 void
 ovn_extend_table_remove_existing(struct ovn_extend_table *table,