From: Florian Forster <octo@collectd.org>
Date: Thu, 17 Dec 2015 12:41:46 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~487
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=4bca6c6b7e03ab4aa0d6a8a59dda3e44608f63f1;p=collectd.git

Merge branch 'collectd-5.5'
---

4bca6c6b7e03ab4aa0d6a8a59dda3e44608f63f1
diff --cc src/barometer.c
index c5e7f77b,84ffdfcb..d60f5881
--- a/src/barometer.c
+++ b/src/barometer.c
@@@ -473,11 -474,12 +473,11 @@@ static int get_reference_temperature(do
              list = list->next;
              continue;
          }
-             
+ 
          for(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];