From owner-p4-projects@FreeBSD.ORG  Thu Aug 14 12:38:38 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EE32137B404; Thu, 14 Aug 2003 12:38:37 -0700 (PDT)
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 9E94137B401
	for <perforce@freebsd.org>; Thu, 14 Aug 2003 12:38:37 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2F57443F85
	for <perforce@freebsd.org>; Thu, 14 Aug 2003 12:38:37 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7EJcb0U069919
	for <perforce@freebsd.org>; Thu, 14 Aug 2003 12:38:37 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7EJcaFM069916
	for perforce@freebsd.org; Thu, 14 Aug 2003 12:38:36 -0700 (PDT)
Date: Thu, 14 Aug 2003 12:38:36 -0700 (PDT)
Message-Id: <200308141938.h7EJcaFM069916@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 36128 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: Thu, 14 Aug 2003 19:38:39 -0000

http://perforce.freebsd.org/chv.cgi?CH=36128

Change 36128 by sam@sam_ebb on 2003/08/14 12:38:23

	moved saved_nrt to be local to the code that uses it and initialize
	it to zero rather than depending on rtrequest to DTRT

Affected files ...

.. //depot/projects/netperf/sys/net/rtsock.c#3 edit

Differences ...

==== //depot/projects/netperf/sys/net/rtsock.c#3 (text+ko) ====

@@ -273,7 +273,6 @@
 {
 	register struct rt_msghdr *rtm = 0;
 	register struct rtentry *rt = 0;
-	struct rtentry *saved_nrt = 0;
 	struct radix_node_head *rnh;
 	struct rt_addrinfo info;
 	int len, error = 0;
@@ -331,10 +330,12 @@
 		senderr(error);
 
 	switch (rtm->rtm_type) {
+		struct rtentry *saved_nrt;
 
 	case RTM_ADD:
 		if (gate == 0)
 			senderr(EINVAL);
+		saved_nrt = 0;
 		error = rtrequest1(RTM_ADD, &info, &saved_nrt);
 		if (error == 0 && saved_nrt) {
 			RT_LOCK(saved_nrt);
@@ -350,6 +351,7 @@
 		break;
 
 	case RTM_DELETE:
+		saved_nrt = 0;
 		error = rtrequest1(RTM_DELETE, &info, &saved_nrt);
 		if (error == 0) {
 			RT_LOCK(saved_nrt);