PERFORCE change 126083 for review
Constantine A. Murenin
cnst at FreeBSD.org
Tue Sep 4 20:37:02 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=126083
Change 126083 by cnst at 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));
}
More information about the p4-projects
mailing list