projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
collectd.spec: add gps plugin
[collectd.git]
/
src
/
barometer.c
diff --git
a/src/barometer.c
b/src/barometer.c
index
84ffdfc
..
fba3450
100644
(file)
--- a/
src/barometer.c
+++ b/
src/barometer.c
@@
-20,6
+20,7
@@
**/
#include "collectd.h"
**/
#include "collectd.h"
+
#include "common.h"
#include "utils_cache.h"
#include "plugin.h"
#include "common.h"
#include "utils_cache.h"
#include "plugin.h"
@@
-343,9
+344,9
@@
static temperature_list_t * temp_list = NULL;
*/
static int temp_list_add(temperature_list_t * list, const char * sensor)
{
*/
static int temp_list_add(temperature_list_t * list, const char * sensor)
{
- temperature_list_t *
new_temp;
+ temperature_list_t *new_temp;
- new_temp =
(temperature_list_t *) malloc(sizeof
(*new_temp));
+ new_temp =
malloc(sizeof
(*new_temp));
if(new_temp == NULL)
return -1;
if(new_temp == NULL)
return -1;
@@
-407,7
+408,6
@@
static int get_reference_temperature(double * result)
gauge_t * values = NULL; /**< rate values */
size_t values_num = 0; /**< number of rate values */
gauge_t * values = NULL; /**< rate values */
size_t values_num = 0; /**< number of rate values */
- int i;
gauge_t values_history[REF_TEMP_AVG_NUM];
gauge_t values_history[REF_TEMP_AVG_NUM];
@@
-445,11
+445,10
@@
static int get_reference_temperature(double * result)
list->initialized = 1;
list->num_values = values_num;
list->initialized = 1;
list->num_values = values_num;
- for(i=0; i<values_num; ++i)
+ for(
size_t
i=0; i<values_num; ++i)
{
{
- DEBUG ("barometer: get_reference_temperature - rate %d: %lf **",
- i,
- values[i]);
+ DEBUG ("barometer: get_reference_temperature - rate %zu: %lf **",
+ i, values[i]);
if(!isnan(values[i]))
{
avg_sum += values[i];
if(!isnan(values[i]))
{
avg_sum += values[i];
@@
-475,11
+474,10
@@
static int get_reference_temperature(double * result)
continue;
}
continue;
}
- for(i=0; i<REF_TEMP_AVG_NUM*list->num_values; ++i)
+ for(
size_t
i=0; i<REF_TEMP_AVG_NUM*list->num_values; ++i)
{
{
- DEBUG ("barometer: get_reference_temperature - history %d: %lf",
- i,
- values_history[i]);
+ DEBUG ("barometer: get_reference_temperature - history %zu: %lf",
+ i, values_history[i]);
if(!isnan(values_history[i]))
{
avg_sum += values_history[i];
if(!isnan(values_history[i]))
{
avg_sum += values_history[i];
@@
-501,11
+499,10
@@
static int get_reference_temperature(double * result)
continue;
}
continue;
}
- for(i=0; i<values_num; ++i)
+ for(
size_t
i=0; i<values_num; ++i)
{
{
- DEBUG ("barometer: get_reference_temperature - rate last %d: %lf **",
- i,
- values[i]);
+ DEBUG ("barometer: get_reference_temperature - rate last %zu: %lf **",
+ i, values[i]);
if(!isnan(values[i]))
{
avg_sum += values[i];
if(!isnan(values[i]))
{
avg_sum += values[i];
@@
-1363,7
+1360,7
@@
static int BMP085_read(double * pressure, double * temperature)
*
* @return detected sensor type
*/
*
* @return detected sensor type
*/
-
enum Sensor_type D
etect_sensor_type(void)
+
static enum Sensor_type d
etect_sensor_type(void)
{
if(BMP085_detect())
return Sensor_BMP085;
{
if(BMP085_detect())
return Sensor_BMP085;
@@
-1583,8
+1580,7
@@
static int MPL115_collectd_barometer_read (void)
already available. */
if(!avg_initialized)
{
already available. */
if(!avg_initialized)
{
- int i;
- for(i=0; i<config_oversample-1; ++i)
+ for(int i=0; i<config_oversample-1; ++i)
{
result = MPL115_read_averaged(&pressure, &temperature);
if(result)
{
result = MPL115_read_averaged(&pressure, &temperature);
if(result)
@@
-1805,7
+1801,7
@@
static int collectd_barometer_init (void)
}
/* detect sensor type - this will also set slave address */
}
/* detect sensor type - this will also set slave address */
- sensor_type =
D
etect_sensor_type();
+ sensor_type =
d
etect_sensor_type();
/* init correct sensor type */
switch(sensor_type)
/* init correct sensor type */
switch(sensor_type)