From owner-p4-projects@FreeBSD.ORG  Wed Sep  5 03:37:02 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E503D16A41A; Wed,  5 Sep 2007 03:37:01 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B35FF16A417
	for <perforce@FreeBSD.org>; Wed,  5 Sep 2007 03:37:01 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A487A13C45D
	for <perforce@FreeBSD.org>; Wed,  5 Sep 2007 03:37:01 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l853b1L5070380
	for <perforce@FreeBSD.org>; Wed, 5 Sep 2007 03:37:01 GMT
	(envelope-from cnst@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l853b1ZN070377
	for perforce@freebsd.org; Wed, 5 Sep 2007 03:37:01 GMT
	(envelope-from cnst@FreeBSD.org)
Date: Wed, 5 Sep 2007 03:37:01 GMT
Message-Id: <200709050337.l853b1ZN070377@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cnst@FreeBSD.org using -f
From: "Constantine A. Murenin" <cnst@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 126083 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 05 Sep 2007 03:37:02 -0000

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

Change 126083 by cnst@dale on 2007/09/05 03:36:08

	tidy up, no md5-change in stripped kern_sensors.o

Affected files ...

.. //depot/projects/soc2007/cnst-sensors/sys.kern/kern_sensors.c#12 edit

Differences ...

==== //depot/projects/soc2007/cnst-sensors/sys.kern/kern_sensors.c#12 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$P4: //depot/projects/soc2007/cnst-sensors/sys.kern/kern_sensors.c#11 $	*/
+/*	$P4: //depot/projects/soc2007/cnst-sensors/sys.kern/kern_sensors.c#12 $	*/
 /*	$FreeBSD$	*/
 /*	$OpenBSD: kern_sensors.c,v 1.19 2007/06/04 18:42:05 deraadt Exp $	*/
 /*	$OpenBSD: kern_sysctl.c,v 1.154 2007/06/01 17:29:10 beck Exp $	*/
@@ -330,8 +330,8 @@
 {
 	int *name = arg1;
 	u_int namelen = arg2;
+	struct ksensordev *ksd;
 	struct ksensor *ks;
-	struct ksensordev *ksd;
 	int dev, numt;
 	enum sensor_type type;
 
@@ -339,20 +339,14 @@
 		return (ENOTDIR);
 
 	dev = name[0];
-
-	ksd = sensordev_get(dev);
-	if (ksd == NULL)
+	if ((ksd = sensordev_get(dev)) == NULL)
 		return (ENOENT);
-
 	if (namelen == 1)
 		return (sysctl_handle_sensordev(NULL, ksd, 0, req));
 
 	type = name[1];
 	numt = name[2];
-
-	ks = sensor_find(ksd, type, numt);
-	if (ks == NULL)
+	if ((ks = sensor_find(ksd, type, numt)) == NULL)
 		return (ENOENT);
-
 	return (sysctl_handle_sensor(NULL, ks, 0, req));
 }