Commit 00aa0040 authored by Blue Swirl's avatar Blue Swirl
Browse files

Wrap recv to avoid warnings 



Avoid warnings like these by wrapping recv():
  CC    slirp/ip_icmp.o
/src/qemu/slirp/ip_icmp.c: In function 'icmp_receive':
/src/qemu/slirp/ip_icmp.c:418:5: error: passing argument 2 of 'recv' from incompatible pointer type [-Werror]
/usr/local/lib/gcc/i686-mingw32msvc/4.6.0/../../../../i686-mingw32msvc/include/winsock2.h:547:32: note: expected 'char *' but argument is of type 'struct icmp *'

Remove also casts used to avoid warnings.

Reviewed-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent aad04cd0

block/sheepdog.c

+1 −1
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ static ssize_t recvmsg(int s, struct msghdr *msg, int flags) 
    }

    buf = qemu_malloc(size);



    ret = recv(s, buf, size, flags);

    ret = qemu_recv(s, buf, size, flags);

    if (ret < 0) {

        goto out;

    }

gdbstub.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static int get_char(GDBState *s) 
    int ret;



    for(;;) {

        ret = recv(s->fd, &ch, 1, 0);

        ret = qemu_recv(s->fd, &ch, 1, 0);

        if (ret < 0) {

            if (errno == ECONNRESET)

                s->fd = -1;

linux-user/syscall.c

+1 −1
Original line number Diff line number Diff line
@@ -2004,7 +2004,7 @@ static abi_long do_recvfrom(int fd, abi_ulong msg, size_t len, int flags, 
        ret = get_errno(recvfrom(fd, host_msg, len, flags, addr, &addrlen));

    } else {

        addr = NULL; /* To keep compiler quiet.  */

        ret = get_errno(recv(fd, host_msg, len, flags));

        ret = get_errno(qemu_recv(fd, host_msg, len, flags));

    }

    if (!is_error(ret)) {

        if (target_addr) {

nbd.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ size_t nbd_wr_sync(int fd, void *buffer, size_t size, bool do_read) 
        ssize_t len;



        if (do_read) {

            len = recv(fd, buffer + offset, size - offset, 0);

            len = qemu_recv(fd, buffer + offset, size - offset, 0);

        } else {

            len = send(fd, buffer + offset, size - offset, 0);

        }

net/socket.c

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static void net_socket_send(void *opaque) 
    uint8_t buf1[4096];

    const uint8_t *buf;



    size = recv(s->fd, (void *)buf1, sizeof(buf1), 0);

    size = qemu_recv(s->fd, buf1, sizeof(buf1), 0);

    if (size < 0) {

        err = socket_error();

        if (err != EWOULDBLOCK)
@@ -138,7 +138,7 @@ static void net_socket_send_dgram(void *opaque) 
    NetSocketState *s = opaque;

    int size;



    size = recv(s->fd, (void *)s->buf, sizeof(s->buf), 0);

    size = qemu_recv(s->fd, s->buf, sizeof(s->buf), 0);

    if (size < 0)

        return;

    if (size == 0) {