From owner-svn-src-all@FreeBSD.ORG  Wed Feb  4 20:04:33 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 519EF106567A;
	Wed,  4 Feb 2009 20:04:33 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3EB8E8FC1F;
	Wed,  4 Feb 2009 20:04:33 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n14K4Xtm089743;
	Wed, 4 Feb 2009 20:04:33 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n14K4Xix089742;
	Wed, 4 Feb 2009 20:04:33 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200902042004.n14K4Xix089742@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Wed, 4 Feb 2009 20:04:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188124 - head/sys/netatalk
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Feb 2009 20:04:34 -0000

Author: rwatson
Date: Wed Feb  4 20:04:32 2009
New Revision: 188124
URL: http://svn.freebsd.org/changeset/base/188124

Log:
  Remove local variable 'ddp' from DDP's attach and detach routines; they
  were used only for assertions, and rather than ifdef'ing them
  INVARIANTS and using local variables, just directly access so_pcb.
  
  Submitted by:	Christoph Mallon <christoph dot mallon at gmx dot de>
  MFC after:	1 week

Modified:
  head/sys/netatalk/ddp_usrreq.c

Modified: head/sys/netatalk/ddp_usrreq.c
==============================================================================
--- head/sys/netatalk/ddp_usrreq.c	Wed Feb  4 20:00:17 2009	(r188123)
+++ head/sys/netatalk/ddp_usrreq.c	Wed Feb  4 20:04:32 2009	(r188124)
@@ -75,11 +75,9 @@ static struct ifqueue atintrq1, atintrq2
 static int
 ddp_attach(struct socket *so, int proto, struct thread *td)
 {
-	struct ddpcb *ddp;
 	int error = 0;
 	
-	ddp = sotoddpcb(so);
-	KASSERT(ddp == NULL, ("ddp_attach: ddp != NULL"));
+	KASSERT(sotoddpcb(so) == NULL, ("ddp_attach: ddp != NULL"));
 
 	/*
 	 * Allocate socket buffer space first so that it's present
@@ -175,10 +173,8 @@ ddp_disconnect(struct socket *so)
 static int
 ddp_shutdown(struct socket *so)
 {
-	struct ddpcb	*ddp;
 
-	ddp = sotoddpcb(so);
-	KASSERT(ddp != NULL, ("ddp_shutdown: ddp == NULL"));
+	KASSERT(sotoddpcb(so) != NULL, ("ddp_shutdown: ddp == NULL"));
 
 	socantsendmore(so);
 	return (0);