util: simplify unix_listen()
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>
This commit is contained in:
parent
9c4d05b741
commit
caf88d74a7
|
@ -970,26 +970,12 @@ static int unix_connect_saddr(UnixSocketAddress *saddr, Error **errp)
|
||||||
/* compatibility wrapper */
|
/* compatibility wrapper */
|
||||||
int unix_listen(const char *str, Error **errp)
|
int unix_listen(const char *str, Error **errp)
|
||||||
{
|
{
|
||||||
char *path, *optstr;
|
|
||||||
int sock, len;
|
|
||||||
UnixSocketAddress *saddr;
|
UnixSocketAddress *saddr;
|
||||||
|
int sock;
|
||||||
|
|
||||||
saddr = g_new0(UnixSocketAddress, 1);
|
saddr = g_new0(UnixSocketAddress, 1);
|
||||||
|
saddr->path = g_strdup(str);
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
sock = unix_listen_saddr(saddr, errp);
|
sock = unix_listen_saddr(saddr, errp);
|
||||||
|
|
||||||
qapi_free_UnixSocketAddress(saddr);
|
qapi_free_UnixSocketAddress(saddr);
|
||||||
return sock;
|
return sock;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue