folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

slirp: Compiler suggested cleanups

Browse source
This commit is contained in:
Mark Pizzolato 2015-10-16 11:38:27 -07:00
parent ed3e9a15b0
commit 007775a404
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
slirp/dnssearch.c
View file

@ -135,7 +135,7 @@ static void domain_mklabels(CompactDomain *cd, const char *input)
if ((len == 0 && cur_chr == '.') || len >= 64) { if ((len == 0 && cur_chr == '.') || len >= 64) {
goto fail; goto fail;
} }
*len_marker = len; *len_marker = (uint8_t)len;
output++; output++;
len_marker = output; len_marker = output;
@ -222,7 +222,7 @@ static size_t domain_compactify(CompactDomain *domains, size_t n)
if (moff < 0x3FFFu) { if (moff < 0x3FFFu) {
cd->len -= cd->common_octets - 2; cd->len -= cd->common_octets - 2;
cd->labels[cd->len - 1] = moff & 0xFFu; 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; size_t len = bsrc_end - bsrc_start;
memmove(result + bdst_start, result + bsrc_start, len); memmove(result + bdst_start, result + bsrc_start, len);
result[bdst_start - 2] = RFC3397_OPT_DOMAIN_SEARCH; 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_end = bsrc_start;
bsrc_start -= MAX_OPT_LEN; bsrc_start -= MAX_OPT_LEN;
bdst_start -= MAX_OPT_LEN + OPT_HEADER_LEN; bdst_start -= MAX_OPT_LEN + OPT_HEADER_LEN;

2
slirp/slirp.c
View file

@ -464,7 +464,7 @@ void slirp_pollfds_poll(GArray *pollfds, int select_error)
return; 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) { QTAILQ_FOREACH(slirp, &slirp_instances, entry) {
/* /*

2
slirp/socket.c
View file

@ -208,7 +208,7 @@ soread(struct socket *so)
return nn; 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; int n, nn, copy = size;
struct sbuf *sb = &so->so_snd; struct sbuf *sb = &so->so_snd;

2
slirp/socket.h
View file

@ -92,6 +92,6 @@ void soisfconnected(register struct socket *);
void sofwdrain(struct socket *); void sofwdrain(struct socket *);
struct iovec; /* For win32 */ struct iovec; /* For win32 */
size_t sopreprbuf(struct socket *so, struct iovec *iov, int *np); 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_ */ #endif /* _SOCKET_H_ */

2
slirp/tcp.h
View file

@ -108,7 +108,7 @@ struct tcphdr {
#define TCP_MSS 1460 #define TCP_MSS 1460
#undef TCP_MAXWIN #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 #undef TCP_MAX_WINSHIFT
#define TCP_MAX_WINSHIFT 14 /* maximum window shift */ #define TCP_MAX_WINSHIFT 14 /* maximum window shift */

2
slirp/tcp_input.c
View file

@ -1468,7 +1468,7 @@ int
tcp_mss(struct tcpcb *tp, u_int offer) tcp_mss(struct tcpcb *tp, u_int offer)
{ {
struct socket *so = tp->t_socket; struct socket *so = tp->t_socket;
int mss; u_int mss;
DEBUG_CALL("tcp_mss"); DEBUG_CALL("tcp_mss");
DEBUG_ARG("tp = %lx", (long)tp); DEBUG_ARG("tp = %lx", (long)tp);