Date: Tue, 30 Mar 2004 19:56:02 -0800 (PST) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 50032 for review Message-ID: <200403310356.i2V3u2CH031713@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=50032 Change 50032 by rwatson@rwatson_tislabs on 2004/03/30 19:55:55 Style fix, avoid initialization in declaration. Affected files ... .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#8 integrate Differences ... ==== //depot/projects/netperf_socket/sys/kern/uipc_socket.c#8 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.167 2004/03/29 18:06:15 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.168 2004/03/31 03:48:35 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -290,6 +290,8 @@ sofree(so) struct socket *so; { + struct socket *head; + KASSERT(so->so_count == 0, ("socket %p so_count not 0", so)); SOCK_LOCK_ASSERT(so); @@ -300,7 +302,7 @@ SOCK_UNLOCK(so); SOCKBUF_LOCK(&so->so_rcv); if (so->so_head != NULL) { - struct socket *head = so->so_head; + head = so->so_head; if (so->so_state & SS_INCOMP) { TAILQ_REMOVE(&head->so_incomp, so, so_list); head->so_incqlen--;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403310356.i2V3u2CH031713>