X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbarometer.c;h=fd733b4959ef002c49766c9c58ba4bea444aaf27;hb=4e8dab9bf35517dfc16a665baaff9e57be617015;hp=66ab20c02427b814788adca24d55784c475b8284;hpb=ec51ddee94fa2ba1e01fe0e336ccc9c190a198ff;p=collectd.git diff --git a/src/barometer.c b/src/barometer.c index 66ab20c0..fd733b49 100644 --- a/src/barometer.c +++ b/src/barometer.c @@ -21,12 +21,15 @@ #include "collectd.h" -#include "common.h" #include "plugin.h" +#include "utils/common/common.h" #include "utils_cache.h" #include #include +#if HAVE_I2C_SMBUS_H +#include +#endif #include #include #include @@ -249,7 +252,7 @@ static averaging_t temperature_averaging; * @return Zero when successful */ static int averaging_create(averaging_t *avg, int size) { - avg->ring_buffer = calloc((size_t)size, sizeof(*avg->ring_buffer)); + avg->ring_buffer = calloc(size, sizeof(*avg->ring_buffer)); if (avg->ring_buffer == NULL) { ERROR("barometer: averaging_create - ring buffer allocation of size %d " "failed", @@ -1306,8 +1309,8 @@ static int collectd_barometer_config(const char *key, const char *value) { } else if (strcasecmp(key, "Normalization") == 0) { int normalize_tmp = atoi(value); if (normalize_tmp < 0 || normalize_tmp > 2) { - WARNING("barometer: collectd_barometer_config: invalid normalization: %d", - normalize_tmp); + ERROR("barometer: collectd_barometer_config: invalid normalization: %d", + normalize_tmp); return 1; } config_normalize = normalize_tmp;