[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/13] util/qemu-sockets: Drop unused helper socket_a
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 02/13] util/qemu-sockets: Drop unused helper socket_address_to_string() |
Date: |
Wed, 12 Jul 2017 16:37:58 +0300 |
From: Mao Zhongyi <address@hidden>
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
include/qemu/sockets.h | 15 ---------------
util/qemu-sockets.c | 34 ----------------------------------
2 files changed, 49 deletions(-)
diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
index 5c326db232..ef6b5591f7 100644
--- a/include/qemu/sockets.h
+++ b/include/qemu/sockets.h
@@ -106,21 +106,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
*
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index d3e51089de..55b6c17f5f 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -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)
{
--
2.11.0
- [Qemu-devel] [PULL 00/13] Trivial patches for 2017-07-12, Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 07/13] elf-loader: warn about invalid endianness, Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 01/13] target/xtensa: gdbstub: drop dead return statement, Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 06/13] configure: Handle having no c++ compiler in FORTIFY_SOURCE check, Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 02/13] util/qemu-sockets: Drop unused helper socket_address_to_string(),
Michael Tokarev <=
- [Qemu-devel] [PULL 03/13] configure: Fix build with pkg-config and --static --enable-sdl, Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 11/13] include/hw/ptimer.h: Add documentation comments, Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 12/13] qobject: Catch another straggler for use of qdict_put_str(), Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 05/13] hw/pci: define msi_nonbroken in pci-stub, Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 13/13] qobject: Update coccinelle script to catch Q{INC, DEC}REF, Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 10/13] hxtool: remove dead -q option, Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 08/13] hw/core: fix missing return value in load_image_targphys_as(), Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 04/13] hw/misc: add missing includes, Michael Tokarev, 2017/07/12
- [Qemu-devel] [PULL 09/13] qga-win32: Fix memory leak of device information set, Michael Tokarev, 2017/07/12
- Re: [Qemu-devel] [PULL 00/13] Trivial patches for 2017-07-12, Eric Blake, 2017/07/12