svn commit: r189041 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
dev/cxgb kern
Robert Watson
rwatson at FreeBSD.org
Wed Feb 25 06:26:19 PST 2009
Author: rwatson
Date: Wed Feb 25 14:26:16 2009
New Revision: 189041
URL: http://svn.freebsd.org/changeset/base/189041
Log:
Merge r188123 from head to stable/7:
Remove written-to but never read local variable 'offset' from
soreceive_dgram().
Submitted by: Christoph Mallon <christoph dot mallon at gmx dot de>
Modified:
stable/7/sys/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/ath/ath_hal/ (props changed)
stable/7/sys/dev/cxgb/ (props changed)
stable/7/sys/kern/uipc_socket.c
Modified: stable/7/sys/kern/uipc_socket.c
==============================================================================
--- stable/7/sys/kern/uipc_socket.c Wed Feb 25 14:08:28 2009 (r189040)
+++ stable/7/sys/kern/uipc_socket.c Wed Feb 25 14:26:16 2009 (r189041)
@@ -1851,7 +1851,7 @@ soreceive_dgram(struct socket *so, struc
struct mbuf **mp0, struct mbuf **controlp, int *flagsp)
{
struct mbuf *m, *m2;
- int flags, len, error, offset;
+ int flags, len, error;
struct protosw *pr = so->so_proto;
struct mbuf *nextrecord;
@@ -2001,7 +2001,6 @@ soreceive_dgram(struct socket *so, struc
}
KASSERT(m->m_type == MT_DATA, ("soreceive_dgram: !data"));
- offset = 0;
while (m != NULL && uio->uio_resid > 0) {
len = uio->uio_resid;
if (len > m->m_len)
More information about the svn-src-stable-7
mailing list