diff options
| author | Eric Blake <eblake@redhat.com> | 2016-03-03 09:16:48 -0700 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-03-05 10:41:52 +0100 |
| commit | 0399293e5b9e5443b82103fa8e2c97deadef9825 (patch) | |
| tree | 51743f16ff479c5e1ff013f7d4a9176b4a9609b8 /util | |
| parent | f194a1ae530e232b994d23aa8651696dd6664b5d (diff) | |
| download | qemu-0399293e5b9e5443b82103fa8e2c97deadef9825.tar.gz qemu-0399293e5b9e5443b82103fa8e2c97deadef9825.tar.bz2 qemu-0399293e5b9e5443b82103fa8e2c97deadef9825.zip | |
util: Shorten references into SocketAddress
An upcoming patch will alter how simple unions, like SocketAddress,
are laid out, which will impact all lines of the form 'addr->u.XXX'
(expanding it to the longer 'addr->u.XXX.data'). For better
legibility in that patch, and less need for line wrapping, it's better
to use a temporary variable to reduce the effect of a layout change to
just the variable initializations, rather than every reference within
a SocketAddress. Also, take advantage of some C99 initialization where
it makes sense (simplifying g_new0() to g_new()).
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1457021813-10704-7-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'util')
| -rw-r--r-- | util/qemu-sockets.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 557da20bf2..ad7c00c9ad 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -1003,6 +1003,7 @@ socket_sockaddr_to_address_inet(struct sockaddr_storage *sa, char host[NI_MAXHOST]; char serv[NI_MAXSERV]; SocketAddress *addr; + InetSocketAddress *inet; int ret; ret = getnameinfo((struct sockaddr *)sa, salen, @@ -1017,13 +1018,13 @@ socket_sockaddr_to_address_inet(struct sockaddr_storage *sa, addr = g_new0(SocketAddress, 1); addr->type = SOCKET_ADDRESS_KIND_INET; - addr->u.inet = g_new0(InetSocketAddress, 1); - addr->u.inet->host = g_strdup(host); - addr->u.inet->port = g_strdup(serv); + inet = addr->u.inet = g_new0(InetSocketAddress, 1); + inet->host = g_strdup(host); + inet->port = g_strdup(serv); if (sa->ss_family == AF_INET) { - addr->u.inet->has_ipv4 = addr->u.inet->ipv4 = true; + inet->has_ipv4 = inet->ipv4 = true; } else { - addr->u.inet->has_ipv6 = addr->u.inet->ipv6 = true; + inet->has_ipv6 = inet->ipv6 = true; } return addr; |