openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

slirp/misc: fix gcc __warn_memset_zero_len warnings 

By removing memset altogether (Patch from Stefan Hajnoczi, tested
compile only by me).

Signed-off-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
This commit is contained in:
Alon Levy 2012-02-24 13:33:49 +02:00 committed by Stefan Hajnoczi
parent 3b26486acd
commit f293d8b1f2
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
slirp/misc.c
View File

@ -333,7 +333,6 @@ void slirp_connection_info(Slirp *slirp, Monitor *mon)
struct socket *so; struct socket *so;
const char *state; const char *state;
char buf[20]; char buf[20];
int n;
monitor_printf(mon, " Protocol[State] FD Source Address Port " monitor_printf(mon, " Protocol[State] FD Source Address Port "
"Dest. Address Port RecvQ SendQ\n"); "Dest. Address Port RecvQ SendQ\n");
@ -357,10 +356,8 @@ void slirp_connection_info(Slirp *slirp, Monitor *mon)
dst_addr = so->so_faddr; dst_addr = so->so_faddr;
dst_port = so->so_fport; dst_port = so->so_fport;
} }
n = snprintf(buf, sizeof(buf), " TCP[%s]", state); snprintf(buf, sizeof(buf), " TCP[%s]", state);
memset(&buf[n], ' ', 19 - n); monitor_printf(mon, "%-19s %3d %15s %5d ", buf, so->s,
buf[19] = 0;
monitor_printf(mon, "%s %3d %15s %5d ", buf, so->s,
src.sin_addr.s_addr ? inet_ntoa(src.sin_addr) : "*", src.sin_addr.s_addr ? inet_ntoa(src.sin_addr) : "*",
ntohs(src.sin_port)); ntohs(src.sin_port));
monitor_printf(mon, "%15s %5d %5d %5d\n", monitor_printf(mon, "%15s %5d %5d %5d\n",
@ -370,22 +367,20 @@ void slirp_connection_info(Slirp *slirp, Monitor *mon)
for (so = slirp->udb.so_next; so != &slirp->udb; so = so->so_next) { for (so = slirp->udb.so_next; so != &slirp->udb; so = so->so_next) {
if (so->so_state & SS_HOSTFWD) { if (so->so_state & SS_HOSTFWD) {
n = snprintf(buf, sizeof(buf), " UDP[HOST_FORWARD]"); snprintf(buf, sizeof(buf), " UDP[HOST_FORWARD]");
src_len = sizeof(src); src_len = sizeof(src);
getsockname(so->s, (struct sockaddr *)&src, &src_len); getsockname(so->s, (struct sockaddr *)&src, &src_len);
dst_addr = so->so_laddr; dst_addr = so->so_laddr;
dst_port = so->so_lport; dst_port = so->so_lport;
} else { } else {
n = snprintf(buf, sizeof(buf), " UDP[%d sec]", snprintf(buf, sizeof(buf), " UDP[%d sec]",
(so->so_expire - curtime) / 1000); (so->so_expire - curtime) / 1000);
src.sin_addr = so->so_laddr; src.sin_addr = so->so_laddr;
src.sin_port = so->so_lport; src.sin_port = so->so_lport;
dst_addr = so->so_faddr; dst_addr = so->so_faddr;
dst_port = so->so_fport; dst_port = so->so_fport;
} }
memset(&buf[n], ' ', 19 - n); monitor_printf(mon, "%-19s %3d %15s %5d ", buf, so->s,
buf[19] = 0;
monitor_printf(mon, "%s %3d %15s %5d ", buf, so->s,
src.sin_addr.s_addr ? inet_ntoa(src.sin_addr) : "*", src.sin_addr.s_addr ? inet_ntoa(src.sin_addr) : "*",
ntohs(src.sin_port)); ntohs(src.sin_port));
monitor_printf(mon, "%15s %5d %5d %5d\n", monitor_printf(mon, "%15s %5d %5d %5d\n",
@ -394,13 +389,11 @@ void slirp_connection_info(Slirp *slirp, Monitor *mon)
} }
for (so = slirp->icmp.so_next; so != &slirp->icmp; so = so->so_next) { for (so = slirp->icmp.so_next; so != &slirp->icmp; so = so->so_next) {
n = snprintf(buf, sizeof(buf), " ICMP[%d sec]", snprintf(buf, sizeof(buf), " ICMP[%d sec]",
(so->so_expire - curtime) / 1000); (so->so_expire - curtime) / 1000);
src.sin_addr = so->so_laddr; src.sin_addr = so->so_laddr;
dst_addr = so->so_faddr; dst_addr = so->so_faddr;
memset(&buf[n], ' ', 19 - n); monitor_printf(mon, "%-19s %3d %15s - ", buf, so->s,
buf[19] = 0;
monitor_printf(mon, "%s %3d %15s - ", buf, so->s,
src.sin_addr.s_addr ? inet_ntoa(src.sin_addr) : "*"); src.sin_addr.s_addr ? inet_ntoa(src.sin_addr) : "*");
monitor_printf(mon, "%15s - %5d %5d\n", inet_ntoa(dst_addr), monitor_printf(mon, "%15s - %5d %5d\n", inet_ntoa(dst_addr),
so->so_rcv.sb_cc, so->so_snd.sb_cc); so->so_rcv.sb_cc, so->so_snd.sb_cc);