Commit 3bcf7d7d authored by Mao Zhongyi's avatar Mao Zhongyi Committed by Michael Tokarev
Browse files

util/qemu-sockets: Drop unused helper socket_address_to_string() 



Signed-off-by: default avatarMao Zhongyi <maozy.fnst@cn.fujitsu.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent aa5a2c0b

include/qemu/sockets.h

+0 −15
Original line number Diff line number Diff line
@@ -105,21 +105,6 @@ SocketAddress *socket_local_address(int fd, Error **errp); 
 */

SocketAddress *socket_remote_address(int fd, Error **errp);



/**

 * socket_address_to_string:

 * @addr: the socket address struct

 * @errp: pointer to uninitialized error object

 *

 * Get the string representation of the socket

 * address. A pointer to the char array containing

 * string format will be returned, the caller is

 * required to release the returned value when no

 * longer required with g_free.

 *

 * Returns: the socket address in string format, or NULL on error

 */

char *socket_address_to_string(struct SocketAddress *addr, Error **errp);



/**

 * socket_address_flatten:

 * @addr: the socket address to flatten

util/qemu-sockets.c

+0 −34
Original line number Diff line number Diff line
@@ -1325,40 +1325,6 @@ SocketAddress *socket_remote_address(int fd, Error **errp) 
    return socket_sockaddr_to_address(&ss, sslen, errp);

}



char *socket_address_to_string(struct SocketAddress *addr, Error **errp)

{

    char *buf;

    InetSocketAddress *inet;



    switch (addr->type) {

    case SOCKET_ADDRESS_TYPE_INET:

        inet = &addr->u.inet;

        if (strchr(inet->host, ':') == NULL) {

            buf = g_strdup_printf("%s:%s", inet->host, inet->port);

        } else {

            buf = g_strdup_printf("[%s]:%s", inet->host, inet->port);

        }

        break;



    case SOCKET_ADDRESS_TYPE_UNIX:

        buf = g_strdup(addr->u.q_unix.path);

        break;



    case SOCKET_ADDRESS_TYPE_FD:

        buf = g_strdup(addr->u.fd.str);

        break;



    case SOCKET_ADDRESS_TYPE_VSOCK:

        buf = g_strdup_printf("%s:%s",

                              addr->u.vsock.cid,

                              addr->u.vsock.port);

        break;



    default:

        abort();

    }

    return buf;

}



SocketAddress *socket_address_flatten(SocketAddressLegacy *addr_legacy)

{