Skip to content

Commit

Permalink
util: simplify unix_listen()
Browse files Browse the repository at this point in the history
The only caller of unix_listen() left is qga/channel-posix.c.

There is no need to deal with legacy coma-trailing options ",...".

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20190503130034.24916-6-marcandre.lureau@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
  • Loading branch information
elmarco authored and kraxel committed May 10, 2019
1 parent 9c4d05b commit caf88d7
Showing 1 changed file with 2 additions and 16 deletions.
18 changes: 2 additions & 16 deletions util/qemu-sockets.c
Original file line number Diff line number Diff line change
Expand Up @@ -970,26 +970,12 @@ static int unix_connect_saddr(UnixSocketAddress *saddr, Error **errp)
/* compatibility wrapper */
int unix_listen(const char *str, Error **errp)
{
char *path, *optstr;
int sock, len;
UnixSocketAddress *saddr;
int sock;

saddr = g_new0(UnixSocketAddress, 1);

optstr = strchr(str, ',');
if (optstr) {
len = optstr - str;
if (len) {
path = g_malloc(len+1);
snprintf(path, len+1, "%.*s", len, str);
saddr->path = path;
}
} else {
saddr->path = g_strdup(str);
}

saddr->path = g_strdup(str);
sock = unix_listen_saddr(saddr, errp);

qapi_free_UnixSocketAddress(saddr);
return sock;
}
Expand Down

0 comments on commit caf88d7

Please sign in to comment.