From 29c3a9f5d8a8a829fb0a306006881eb3541b5daf Mon Sep 17 00:00:00 2001 From: Alex Wang Date: Wed, 10 Jun 2015 15:31:51 -0700 Subject: [PATCH] ovs-vsctl: Simplify code. Signed-off-by: Alex Wang Acked-by: Ben Pfaff --- utilities/ovs-vsctl.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c index 009a8caad..e800f6f9e 100644 --- a/utilities/ovs-vsctl.c +++ b/utilities/ovs-vsctl.c @@ -2544,9 +2544,8 @@ cmd_get_manager(struct vsctl_context *ctx) } static void -delete_managers(const struct vsctl_context *ctx) +delete_managers(const struct ovsrec_open_vswitch *ovs) { - const struct ovsrec_open_vswitch *ovs = ctx->ovs; size_t i; /* Delete Manager rows pointed to by 'manager_options' column. */ @@ -2564,7 +2563,7 @@ cmd_del_manager(struct vsctl_context *ctx) const struct ovsrec_open_vswitch *ovs = ctx->ovs; verify_managers(ovs); - delete_managers(ctx); + delete_managers(ovs); } static void @@ -2594,7 +2593,7 @@ cmd_set_manager(struct vsctl_context *ctx) const size_t n = ctx->argc - 1; verify_managers(ctx->ovs); - delete_managers(ctx); + delete_managers(ctx->ovs); insert_managers(ctx, &ctx->argv[1], n); } -- 2.20.1