Thanks, applied to master.
On Fri, Apr 27, 2018 at 04:39:20PM -0700, Yifeng Sun wrote: > Thanks. > > Reviewed-by: Yifeng Sun <[email protected]> > > On Wed, Apr 25, 2018 at 8:42 AM, Ben Pfaff <[email protected]> wrote: > > > There's not much value in making this a global since it's really just > > parsed in one function and used in another. > > > > Signed-off-by: Ben Pfaff <[email protected]> > > --- > > ovn/controller/ovn-controller.c | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/ovn/controller/ovn-controller.c b/ovn/controller/ovn- > > controller.c > > index 27a092d13508..29b3f1cade0a 100644 > > --- a/ovn/controller/ovn-controller.c > > +++ b/ovn/controller/ovn-controller.c > > @@ -74,7 +74,7 @@ static unixctl_cb_func inject_pkt; > > > > static void update_probe_interval(struct controller_ctx *, > > const char *ovnsb_remote); > > -static void parse_options(int argc, char *argv[]); > > +static char *parse_options(int argc, char *argv[]); > > OVS_NO_RETURN static void usage(void); > > > > /* Pending packet to be injected into connected OVS. */ > > @@ -84,8 +84,6 @@ struct pending_pkt { > > char *flow_s; > > }; > > > > -static char *ovs_remote; > > - > > struct local_datapath * > > get_local_datapath(const struct hmap *local_datapaths, uint32_t > > tunnel_key) > > { > > @@ -600,7 +598,7 @@ main(int argc, char *argv[]) > > ovs_cmdl_proctitle_init(argc, argv); > > set_program_name(argv[0]); > > service_start(&argc, &argv); > > - parse_options(argc, argv); > > + char *ovs_remote = parse_options(argc, argv); > > fatal_ignore_sigpipe(); > > > > daemonize_start(false); > > @@ -891,7 +889,7 @@ main(int argc, char *argv[]) > > exit(retval); > > } > > > > -static void > > +static char * > > parse_options(int argc, char *argv[]) > > { > > enum { > > @@ -954,6 +952,7 @@ parse_options(int argc, char *argv[]) > > argc -= optind; > > argv += optind; > > > > + char *ovs_remote; > > if (argc == 0) { > > ovs_remote = xasprintf("unix:%s/db.sock", ovs_rundir()); > > } else if (argc == 1) { > > @@ -962,6 +961,7 @@ parse_options(int argc, char *argv[]) > > VLOG_FATAL("exactly zero or one non-option argument required; " > > "use --help for usage"); > > } > > + return ovs_remote; > > } > > > > static void > > -- > > 2.16.1 > > > > _______________________________________________ > > dev mailing list > > [email protected] > > https://mail.openvswitch.org/mailman/listinfo/ovs-dev > > _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
