This drops an unused parameter and groups the calls to these functions
with ofctrl_destroy() in each case.
Signed-off-by: Ben Pfaff <b...@nicira.com>
---
ovn/controller/ovn-controller.c | 5 ++---
ovn/controller/pipeline.c | 2 +-
ovn/controller/pipeline.h | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ovn/controller/ovn-controller.c b/ovn/controller/ovn-controller.c
index 303a722..59feaf9 100644
--- a/ovn/controller/ovn-controller.c
+++ b/ovn/controller/ovn-controller.c
@@ -225,6 +225,7 @@ main(int argc, char *argv[])
sbrec_init();
ofctrl_init();
+ pipeline_init();
/* Connect to OVS OVSDB instance. We do not monitor all tables by
* default, so modules must register their interest explicitly. */
@@ -236,8 +237,6 @@ main(int argc, char *argv[])
binding_register_ovs_idl(ctx.ovs_idl);
physical_register_ovs_idl(ctx.ovs_idl);
- pipeline_init();
-
get_initial_snapshot(ctx.ovs_idl);
char *ovnsb_remote = get_ovnsb_remote(ctx.ovs_idl);
@@ -313,7 +312,7 @@ main(int argc, char *argv[])
}
unixctl_server_destroy(unixctl);
- pipeline_destroy(&ctx);
+ pipeline_destroy();
ofctrl_destroy();
idl_loop_destroy(&ovs_idl_loop);
diff --git a/ovn/controller/pipeline.c b/ovn/controller/pipeline.c
index 151b9d5..4c0ffd3 100644
--- a/ovn/controller/pipeline.c
+++ b/ovn/controller/pipeline.c
@@ -357,7 +357,7 @@ pipeline_run(struct controller_ctx *ctx, struct hmap
*flow_table)
}
void
-pipeline_destroy(struct controller_ctx *ctx OVS_UNUSED)
+pipeline_destroy(void)
{
expr_symtab_destroy(&symtab);
ldp_destroy();
diff --git a/ovn/controller/pipeline.h b/ovn/controller/pipeline.h
index 889fef9..7d33341 100644
--- a/ovn/controller/pipeline.h
+++ b/ovn/controller/pipeline.h
@@ -43,7 +43,7 @@ struct uuid;
void pipeline_init(void);
void pipeline_run(struct controller_ctx *, struct hmap *flow_table);
-void pipeline_destroy(struct controller_ctx *);
+void pipeline_destroy(void);
uint32_t ldp_to_integer(const struct uuid *logical_datapath);
--
2.1.3
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
