diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2012-10-06 18:54:14 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2012-10-06 18:54:14 +0200 |
| commit | 048d3612a51b3da45081091b734f93428925ebf8 (patch) | |
| tree | ad2b1235146f9bc5b94c1bfae02327ee3b03fa40 /slirp | |
| parent | 6b2f90fbbd31d594238098f46ef63ee307a12f55 (diff) | |
| parent | 02cd521f6e207bd8843a7c1309f6d065cf01c6ee (diff) | |
| download | qemu-048d3612a51b3da45081091b734f93428925ebf8.zip qemu-048d3612a51b3da45081091b734f93428925ebf8.tar.gz qemu-048d3612a51b3da45081091b734f93428925ebf8.tar.bz2 | |
Merge branch 'trivial-patches' of git://github.com/stefanha/qemu
* 'trivial-patches' of git://github.com/stefanha/qemu:
versatilepb: Use symbolic indices for ARM PIC
qdev: kill bogus comment
qemu-barrier: Fix compiler version check for future gcc versions
hw: Add missing 'static' attribute for QEMUMachine
cleanup useless return sentence
qemu-sockets: Fix compiler warning (regression for MinGW)
vnc: Fix spelling (hellmen -> hellman) in comment
slirp: Fix spelling in comment (enought -> enough, insure -> ensure)
tcg/arm: Use tcg_out_mov_reg rather than inline equivalent code
cpu: Add missing 'static' attribute to qemu_global_mutex
configure: Support empty target list (--target-list=)
hw: Fix return value check for bdrv_read, bdrv_write
Diffstat (limited to 'slirp')
| -rw-r--r-- | slirp/ip_icmp.h | 4 | ||||
| -rw-r--r-- | slirp/ip_input.c | 1 | ||||
| -rw-r--r-- | slirp/tcp_input.c | 2 | ||||
| -rw-r--r-- | slirp/udp.c | 1 |
4 files changed, 2 insertions, 6 deletions
diff --git a/slirp/ip_icmp.h b/slirp/ip_icmp.h index 1a1af91..be4426b 100644 --- a/slirp/ip_icmp.h +++ b/slirp/ip_icmp.h @@ -92,8 +92,8 @@ struct icmp { /* * Lower bounds on packet lengths for various types. - * For the error advice packets must first insure that the - * packet is large enought to contain the returned ip header. + * For the error advice packets must first ensure that the + * packet is large enough to contain the returned ip header. * Only then can we do the check to see if 64 bits of packet * data have been returned, since we need to check the returned * ip header length. diff --git a/slirp/ip_input.c b/slirp/ip_input.c index ce24faf..6f4cff8 100644 --- a/slirp/ip_input.c +++ b/slirp/ip_input.c @@ -213,7 +213,6 @@ ip_input(struct mbuf *m) return; bad: m_free(m); - return; } #define iptofrag(P) ((struct ipasfrag *)(((char*)(P)) - sizeof(struct qlink))) diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c index 942aaf4..6440eae 100644 --- a/slirp/tcp_input.c +++ b/slirp/tcp_input.c @@ -1281,8 +1281,6 @@ drop: * Drop space held by incoming segment and return. */ m_free(m); - - return; } static void diff --git a/slirp/udp.c b/slirp/udp.c index ced5096..9286cb7 100644 --- a/slirp/udp.c +++ b/slirp/udp.c @@ -231,7 +231,6 @@ udp_input(register struct mbuf *m, int iphlen) return; bad: m_free(m); - return; } int udp_output2(struct socket *so, struct mbuf *m, |