From owner-p4-projects@FreeBSD.ORG  Tue Mar 30 19:56:03 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 99ABE16A4D0; Tue, 30 Mar 2004 19:56:03 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 740A916A4CE
	for <perforce@freebsd.org>; Tue, 30 Mar 2004 19:56:03 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6C40343D2F
	for <perforce@freebsd.org>; Tue, 30 Mar 2004 19:56:03 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2V3u3Ge031716
	for <perforce@freebsd.org>; Tue, 30 Mar 2004 19:56:03 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2V3u2CH031713
	for perforce@freebsd.org; Tue, 30 Mar 2004 19:56:02 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 30 Mar 2004 19:56:02 -0800 (PST)
Message-Id: <200403310356.i2V3u2CH031713@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 50032 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 31 Mar 2004 03:56:04 -0000

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--;