diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/kern_sensors.c | 6 | ||||
| -rw-r--r-- | sys/kern/kern_sysctl.c | 6 | ||||
| -rw-r--r-- | sys/sys/sensors.h | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/sys/kern/kern_sensors.c b/sys/kern/kern_sensors.c index 3268ae7e388..93e90daf5fe 100644 --- a/sys/kern/kern_sensors.c +++ b/sys/kern/kern_sensors.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sensors.c,v 1.4 2005/11/13 22:41:56 dlg Exp $ */ +/* $OpenBSD: kern_sensors.c,v 1.5 2005/11/21 13:47:52 dlg Exp $ */ /* * Copyright (c) 2005 David Gwynne <dlg@openbsd.org> @@ -27,8 +27,8 @@ #include <sys/sensors.h> -int nsensors = 0; -struct sensors_head sensors = SLIST_HEAD_INITIALIZER(&sensors); +int _sensors_count = 0; +struct sensors_head _sensors_list = SLIST_HEAD_INITIALIZER(&_sensors_list); struct sensor_task { void *arg; diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index c4980064163..c412884b2c4 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sysctl.c,v 1.134 2005/11/19 02:18:01 pedro Exp $ */ +/* $OpenBSD: kern_sysctl.c,v 1.135 2005/11/21 13:47:52 dlg Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */ /*- @@ -1839,10 +1839,10 @@ sysctl_sensors(int *name, u_int namelen, void *oldp, size_t *oldlenp, return (ENOTDIR); num = name[0]; - if (num < 0 || num >= nsensors) + if (num < 0 || num >= _sensors_count) return (ENXIO); - SLIST_FOREACH(s, &sensors, list) + SLIST_FOREACH(s, &_sensors_list, list) if (s->num == num) break; diff --git a/sys/sys/sensors.h b/sys/sys/sensors.h index 56838c09b60..fcae096c56b 100644 --- a/sys/sys/sensors.h +++ b/sys/sys/sensors.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sensors.h,v 1.10 2005/11/15 22:12:07 kettenis Exp $ */ +/* $OpenBSD: sensors.h,v 1.11 2005/11/21 13:47:52 dlg Exp $ */ /* * Copyright (c) 2003, 2004 Alexander Yurchenko <grange@openbsd.org> @@ -72,12 +72,12 @@ struct sensor { SLIST_HEAD(sensors_head, sensor); #ifdef _KERNEL -extern int nsensors; -extern struct sensors_head sensors; +extern int _sensors_count; +extern struct sensors_head _sensors_list; #define SENSOR_ADD(s) do { \ - (s)->num = nsensors++; \ - SLIST_INSERT_HEAD(&sensors, (s), list); \ + (s)->num = _sensors_count++; \ + SLIST_INSERT_HEAD(&_sensors_list, (s), list); \ } while (0) int sensor_task_register(void *, void (*)(void *), int); |