From 007775a404fbeddc56faec34199db967e98b2510 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Fri, 16 Oct 2015 11:38:27 -0700
Subject: [PATCH] slirp: Compiler suggested cleanups

---
 slirp/dnssearch.c | 6 +++---
 slirp/slirp.c     | 2 +-
 slirp/socket.c    | 2 +-
 slirp/socket.h    | 2 +-
 slirp/tcp.h       | 2 +-
 slirp/tcp_input.c | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/slirp/dnssearch.c b/slirp/dnssearch.c
index cbf91ee7..b6ff28d4 100644
--- a/slirp/dnssearch.c
+++ b/slirp/dnssearch.c
@@ -135,7 +135,7 @@ static void domain_mklabels(CompactDomain *cd, const char *input)
             if ((len == 0 && cur_chr == '.') || len >= 64) {
                 goto fail;
             }
-            *len_marker = len;
+            *len_marker = (uint8_t)len;
 
             output++;
             len_marker = output;
@@ -222,7 +222,7 @@ static size_t domain_compactify(CompactDomain *domains, size_t n)
             if (moff < 0x3FFFu) {
                 cd->len -= cd->common_octets - 2;
                 cd->labels[cd->len - 1] = moff & 0xFFu;
-                cd->labels[cd->len - 2] = 0xC0u | (moff >> 8);
+                cd->labels[cd->len - 2] = (uint8_t)(0xC0u | (moff >> 8));
             }
         }
 
@@ -301,7 +301,7 @@ int translate_dnssearch(Slirp *s, const char **names)
         size_t len = bsrc_end - bsrc_start;
         memmove(result + bdst_start, result + bsrc_start, len);
         result[bdst_start - 2] = RFC3397_OPT_DOMAIN_SEARCH;
-        result[bdst_start - 1] = len;
+        result[bdst_start - 1] = (uint8_t)len;
         bsrc_end = bsrc_start;
         bsrc_start -= MAX_OPT_LEN;
         bdst_start -= MAX_OPT_LEN + OPT_HEADER_LEN;
diff --git a/slirp/slirp.c b/slirp/slirp.c
index af69a57d..c24a342e 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -464,7 +464,7 @@ void slirp_pollfds_poll(GArray *pollfds, int select_error)
         return;
     }
 
-    curtime = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
+    curtime = (u_int)qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
 
     QTAILQ_FOREACH(slirp, &slirp_instances, entry) {
         /*
diff --git a/slirp/socket.c b/slirp/socket.c
index 60e3df51..e9e61c40 100644
--- a/slirp/socket.c
+++ b/slirp/socket.c
@@ -208,7 +208,7 @@ soread(struct socket *so)
 	return nn;
 }
 
-int soreadbuf(struct socket *so, const char *buf, int size)
+int soreadbuf(struct socket *so, const char *buf, size_t size)
 {
     int n, nn, copy = size;
 	struct sbuf *sb = &so->so_snd;
diff --git a/slirp/socket.h b/slirp/socket.h
index 11aa5188..7ae911b6 100644
--- a/slirp/socket.h
+++ b/slirp/socket.h
@@ -92,6 +92,6 @@ void soisfconnected(register struct socket *);
 void sofwdrain(struct socket *);
 struct iovec; /* For win32 */
 size_t sopreprbuf(struct socket *so, struct iovec *iov, int *np);
-int soreadbuf(struct socket *so, const char *buf, int size);
+int soreadbuf(struct socket *so, const char *buf, size_t size);
 
 #endif /* _SOCKET_H_ */
diff --git a/slirp/tcp.h b/slirp/tcp.h
index 4c3a827e..a9e90c51 100644
--- a/slirp/tcp.h
+++ b/slirp/tcp.h
@@ -108,7 +108,7 @@ struct tcphdr {
 #define	TCP_MSS	1460
 
 #undef TCP_MAXWIN
-#define	TCP_MAXWIN	65535	/* largest value for (unscaled) window */
+#define	TCP_MAXWIN	65535u	/* largest value for (unscaled) window */
 
 #undef TCP_MAX_WINSHIFT
 #define TCP_MAX_WINSHIFT	14	/* maximum window shift */
diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c
index f99bf2f8..54eeb136 100644
--- a/slirp/tcp_input.c
+++ b/slirp/tcp_input.c
@@ -1468,7 +1468,7 @@ int
 tcp_mss(struct tcpcb *tp, u_int offer)
 {
 	struct socket *so = tp->t_socket;
-	int mss;
+	u_int mss;
 
 	DEBUG_CALL("tcp_mss");
 	DEBUG_ARG("tp = %lx", (long)tp);