 @@ -1,14 +1,14 @@
-/* $NetBSD: envstat.c,v 1.87 2011/06/06 20:48:56 pgoyette Exp $ */
+/* $NetBSD: envstat.c,v 1.88 2011/06/07 17:24:32 pgoyette Exp $ */
 /*-
  * Copyright (c) 2007, 2008 Juan Romero Pardines.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,33 +17,34 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: envstat.c,v 1.87 2011/06/06 20:48:56 pgoyette Exp $");
+__RCSID("$NetBSD: envstat.c,v 1.88 2011/06/07 17:24:32 pgoyette Exp $");
 #endif /* not lint */
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <err.h>
 #include <errno.h>
 #include <paths.h>
 #include <syslog.h>
 #include <sys/envsys.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <prop/proplib.h>
 @@ -337,26 +338,28 @@ find_stats_sensor(const char *desc)
 	/*
 	 * If we matched a sensor by its description return it, otherwise
 	 * allocate a new one.
 	 */
 	SIMPLEQ_FOREACH(stats, &sensor_stats_list, entries)
 		if (strcmp(stats->desc, desc) == 0)
 			return stats;
 	stats = calloc(1, sizeof(*stats));
 	if (stats == NULL)
 		return NULL;
 	(void)strlcpy(stats->desc, desc, sizeof(stats->desc));
 	stats->min = INT32_MAX;
 	stats->max = INT32_MIN;
 	SIMPLEQ_INSERT_TAIL(&sensor_stats_list, stats, entries);
 	return stats;
+}
 static int
 parse_dictionary(int fd)
+{
 	sensor_t sensor = NULL;
 	dvprops_t edp = NULL;
 	prop_array_t array;
 	prop_dictionary_t dict;
 	prop_object_iterator_t iter;
 @@ -615,54 +618,47 @@ find_sensors(prop_array_t array, const c
 		/* Add the sensor into the list */
 		SIMPLEQ_INSERT_TAIL(&sensors_list, sensor, entries);
 		/* Collect statistics if flag enabled */
 		if (statistics) {
 			/* ignore sensors not relevant for statistics */
 			if ((strcmp(sensor->type, "Indicator") == 0) ||
 			    (strcmp(sensor->type, "Battery charge") == 0) ||
 			    (strcmp(sensor->type, "Drive") == 0))
 				continue;
 			/* ignore invalid data */
-			if (sensor->invalid || !sensor->cur_value)
+			if (sensor->invalid)
 				continue;
 			/* find or allocate a new statistics sensor */
 			stats = find_stats_sensor(sensor->desc);
 			if (stats == NULL) {
 				free(sensor);
 				prop_object_iterator_release(iter);
 				return ENOMEM;
+			}
-			/* collect data */
+			/* update data */
 			if (!stats->max)
 				stats->max = sensor->cur_value;
 			if (!stats->min)
 				stats->min = sensor->cur_value;
 			if (sensor->cur_value > stats->max)
 				stats->max = sensor->cur_value;
 			if (sensor->cur_value < stats->min)
 				stats->min = sensor->cur_value;
 			/* compute avg value */
-			if (stats->max && stats->min)
+			stats->avg =
-				stats->avg =
+			    (sensor->cur_value + stats->max + stats->min) / 3;
 				    (sensor->cur_value + stats->max +
 				    stats->min) / 3;
+		}
+	}
 	/* free memory */
 	prop_object_iterator_release(iter);
 	return 0;
+}
 static int
 check_sensors(char *str)
+{
 	sensor_t sensor = NULL;
 	char *dvstring, *sstring, *p, *last;