[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/14] socket: Make errp the last parameter of unix_
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH 03/14] socket: Make errp the last parameter of unix_connect_saddr |
Date: |
Fri, 21 Apr 2017 20:26:59 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
---
util/qemu-sockets.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 8e11349..0fe5f13 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -911,8 +911,9 @@ err:
return -1;
}
-static int unix_connect_saddr(UnixSocketAddress *saddr, Error **errp,
- NonBlockingConnectHandler *callback, void
*opaque)
+static int unix_connect_saddr(UnixSocketAddress *saddr,
+ NonBlockingConnectHandler *callback, void
*opaque,
+ Error **errp)
{
struct sockaddr_un un;
ConnectState *connect_state = NULL;
@@ -979,8 +980,9 @@ static int unix_listen_saddr(UnixSocketAddress *saddr,
return -1;
}
-static int unix_connect_saddr(UnixSocketAddress *saddr, Error **errp,
- NonBlockingConnectHandler *callback, void
*opaque)
+static int unix_connect_saddr(UnixSocketAddress *saddr,
+ NonBlockingConnectHandler *callback, void
*opaque,
+ Error **errp)
{
error_setg(errp, "unix sockets are not available on windows");
errno = ENOTSUP;
@@ -1026,7 +1028,7 @@ int unix_connect(const char *path, Error **errp)
saddr = g_new0(UnixSocketAddress, 1);
saddr->path = g_strdup(path);
- sock = unix_connect_saddr(saddr, errp, NULL, NULL);
+ sock = unix_connect_saddr(saddr, NULL, NULL, errp);
qapi_free_UnixSocketAddress(saddr);
return sock;
}
@@ -1086,7 +1088,7 @@ int socket_connect(SocketAddress *addr,
NonBlockingConnectHandler *callback,
break;
case SOCKET_ADDRESS_KIND_UNIX:
- fd = unix_connect_saddr(addr->u.q_unix.data, errp, callback, opaque);
+ fd = unix_connect_saddr(addr->u.q_unix.data, callback, opaque, errp);
break;
case SOCKET_ADDRESS_KIND_FD:
--
2.9.3
- [Qemu-devel] [PATCH 00/14] Trivial cleanups around error reporting, Fam Zheng, 2017/04/21
- [Qemu-devel] [PATCH 01/14] socket: Make errp the last parameter of socket_connect, Fam Zheng, 2017/04/21
- [Qemu-devel] [PATCH 02/14] socket: Make errp the last parameter of inet_connect_saddr, Fam Zheng, 2017/04/21
- [Qemu-devel] [PATCH 03/14] socket: Make errp the last parameter of unix_connect_saddr,
Fam Zheng <=
- [Qemu-devel] [PATCH 04/14] socket: Make errp the last parameter of vsock_connect_saddr, Fam Zheng, 2017/04/21
- [Qemu-devel] [PATCH 05/14] block: Make errp the last parameter of bdrv_img_create, Fam Zheng, 2017/04/21
- [Qemu-devel] [PATCH 06/14] crypto: Make errp the last parameter of functions, Fam Zheng, 2017/04/21
[Qemu-devel] [PATCH 07/14] mirror: Make errp the last parameter of mirror_start_job, Fam Zheng, 2017/04/21
[Qemu-devel] [PATCH 08/14] block: Make errp the last parameter of commit_active_start, Fam Zheng, 2017/04/21