mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 23:33:54 -06:00
socket: Make errp the last parameter of inet_connect_saddr
Signed-off-by: Fam Zheng <famz@redhat.com> Message-Id: <20170421122710.15373-3-famz@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
parent
226799cec5
commit
6dffc1f670
3 changed files with 9 additions and 7 deletions
|
@ -427,8 +427,9 @@ static struct addrinfo *inet_parse_connect_saddr(InetSocketAddress *saddr,
|
|||
* function succeeds, callback will be called when the connection
|
||||
* completes, with the file descriptor on success, or -1 on error.
|
||||
*/
|
||||
int inet_connect_saddr(InetSocketAddress *saddr, Error **errp,
|
||||
NonBlockingConnectHandler *callback, void *opaque)
|
||||
int inet_connect_saddr(InetSocketAddress *saddr,
|
||||
NonBlockingConnectHandler *callback, void *opaque,
|
||||
Error **errp)
|
||||
{
|
||||
Error *local_err = NULL;
|
||||
struct addrinfo *res, *e;
|
||||
|
@ -659,7 +660,7 @@ int inet_connect(const char *str, Error **errp)
|
|||
|
||||
addr = inet_parse(str, errp);
|
||||
if (addr != NULL) {
|
||||
sock = inet_connect_saddr(addr, errp, NULL, NULL);
|
||||
sock = inet_connect_saddr(addr, NULL, NULL, errp);
|
||||
qapi_free_InetSocketAddress(addr);
|
||||
}
|
||||
return sock;
|
||||
|
@ -1081,7 +1082,7 @@ int socket_connect(SocketAddress *addr, NonBlockingConnectHandler *callback,
|
|||
|
||||
switch (addr->type) {
|
||||
case SOCKET_ADDRESS_KIND_INET:
|
||||
fd = inet_connect_saddr(addr->u.inet.data, errp, callback, opaque);
|
||||
fd = inet_connect_saddr(addr->u.inet.data, callback, opaque, errp);
|
||||
break;
|
||||
|
||||
case SOCKET_ADDRESS_KIND_UNIX:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue