Commit c06b7278 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Kevin Wolf
Browse files

nbd: inline tcp_socket_incoming_spec into sole caller 



Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 77e8b9ca

include/block/nbd.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

nbd.c

+2 −6
Original line number Diff line number Diff line
@@ -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) {