Thanks, pushed to master, branch-1.6.
On Fri, Mar 23, 2012 at 01:52:37PM -0700, Ethan Jackson wrote:
> Looks good, thanks.
>
> Ethan
>
> On Fri, Mar 23, 2012 at 13:42, Ben Pfaff <b...@nicira.com> wrote:
> > 'path' is usually not the right path (often it's NULL).
> >
> > Introduced in commit bde9f75de (unixctl: New JSON RPC back-end.).
> >
> > Signed-off-by: Ben Pfaff <b...@nicira.com>
> > ---
> > lib/unixctl.c | 12 ++++++------
> > 1 files changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/lib/unixctl.c b/lib/unixctl.c
> > index 054ce49..d8974c9 100644
> > --- a/lib/unixctl.c
> > +++ b/lib/unixctl.c
> > @@ -222,12 +222,9 @@ unixctl_server_create(const char *path, struct
> > unixctl_server **serverp)
> > }
> >
> > error = pstream_open(punix_path, &listener);
> > - free(punix_path);
> > - punix_path = NULL;
> > -
> > if (error) {
> > - ovs_error(error, "could not initialize control socket %s", path);
> > - return error;
> > + ovs_error(error, "could not initialize control socket %s",
> > punix_path);
> > + goto exit;
> > }
> >
> > unixctl_command_register("help", "", 0, 0, unixctl_help, NULL);
> > @@ -237,7 +234,10 @@ unixctl_server_create(const char *path, struct
> > unixctl_server **serverp)
> > server->listener = listener;
> > list_init(&server->conns);
> > *serverp = server;
> > - return 0;
> > +
> > +exit:
> > + free(punix_path);
> > + return error;
> > }
> >
> > static void
> > --
> > 1.7.2.5
> >
> > _______________________________________________
> > dev mailing list
> > dev@openvswitch.org
> > http://openvswitch.org/mailman/listinfo/dev
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
