From 324f0c59d2bf3a0ad74c93b683b6ceeb1d732304 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 23 Mar 2012 13:42:12 -0700 Subject: [PATCH] unixctl: Fix bad log message on error path. '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 --- lib/unixctl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/unixctl.c b/lib/unixctl.c index 054ce49c..d8974c9e 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 -- 2.30.2