From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51883) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGyLT-0001pe-AG for qemu-devel@nongnu.org; Fri, 21 Feb 2014 17:13:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WGyLN-0000Tu-Ak for qemu-devel@nongnu.org; Fri, 21 Feb 2014 17:13:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44881) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGyLN-0000Tl-2a for qemu-devel@nongnu.org; Fri, 21 Feb 2014 17:13:17 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s1LMDGdK004521 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 21 Feb 2014 17:13:16 -0500 From: Kevin Wolf Date: Fri, 21 Feb 2014 23:12:10 +0100 Message-Id: <1393020771-32712-14-git-send-email-kwolf@redhat.com> In-Reply-To: <1393020771-32712-1-git-send-email-kwolf@redhat.com> References: <1393020771-32712-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 13/54] nbd: inline tcp_socket_incoming_spec into sole caller List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com From: Paolo Bonzini Signed-off-by: Paolo Bonzini Reviewed-by: Fam Zheng Signed-off-by: Kevin Wolf --- include/block/nbd.h | 1 - nbd.c | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/block/nbd.h b/include/block/nbd.h index e10ab82..1b39c06 100644 --- a/include/block/nbd.h +++ b/include/block/nbd.h @@ -63,7 +63,6 @@ enum { ssize_t nbd_wr_sync(int fd, void *buffer, size_t size, bool do_read); int tcp_socket_incoming(const char *address, uint16_t port); -int tcp_socket_incoming_spec(const char *address_and_port); int unix_socket_outgoing(const char *path); int unix_socket_incoming(const char *path); diff --git a/nbd.c b/nbd.c index 17ca95b..2fc1f1f 100644 --- a/nbd.c +++ b/nbd.c @@ -202,13 +202,9 @@ static void combine_addr(char *buf, size_t len, const char* address, int tcp_socket_incoming(const char *address, uint16_t port) { char address_and_port[128]; - combine_addr(address_and_port, 128, address, port); - return tcp_socket_incoming_spec(address_and_port); -} - -int tcp_socket_incoming_spec(const char *address_and_port) -{ Error *local_err = NULL; + + combine_addr(address_and_port, 128, address, port); int fd = inet_listen(address_and_port, NULL, 0, SOCK_STREAM, 0, &local_err); if (local_err != NULL) { -- 1.8.1.4