X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Faggregation.c;h=b9db500b188f17eb7a0a478d07f136feaae9d774;hb=f0735d24a2195c8da2657c46a7cb9ceb790b0836;hp=84df548511079d2afdd66eb2144b8042b6aa6074;hpb=69b8a9a1af204685dfdfaf1279a0f2928e0bbb32;p=collectd.git

diff --git a/src/aggregation.c b/src/aggregation.c
index 84df5485..b9db500b 100644
--- a/src/aggregation.c
+++ b/src/aggregation.c
@@ -337,7 +337,7 @@ static int agg_instance_read_func (agg_instance_t *inst, /* {{{ */
   char const *func, gauge_t rate, rate_to_value_state_t *state,
   value_list_t *vl, char const *pi_prefix, cdtime_t t)
 {
-  value_t v = { 0 } ;
+  value_t v;
   int status;
 
   if (pi_prefix[0] != 0)
@@ -483,9 +483,7 @@ static void agg_lookup_free_obj_callback (void *user_obj) /* {{{ */
 static int agg_config_handle_group_by (oconfig_item_t const *ci, /* {{{ */
     aggregation_t *agg)
 {
-  int i;
-
-  for (i = 0; i < ci->values_num; i++)
+  for (int i = 0; i < ci->values_num; i++)
   {
     char const *value;
 
@@ -521,7 +519,6 @@ static int agg_config_aggregation (oconfig_item_t *ci) /* {{{ */
   aggregation_t *agg;
   _Bool is_valid;
   int status;
-  int i;
 
   agg = calloc (1, sizeof (*agg));
   if (agg == NULL)
@@ -538,7 +535,7 @@ static int agg_config_aggregation (oconfig_item_t *ci) /* {{{ */
   sstrncpy (agg->ident.type_instance, "/.*/",
       sizeof (agg->ident.type_instance));
 
-  for (i = 0; i < ci->children_num; i++)
+  for (int i = 0; i < ci->children_num; i++)
   {
     oconfig_item_t *child = ci->children + i;
 
@@ -676,8 +673,6 @@ static int agg_config_aggregation (oconfig_item_t *ci) /* {{{ */
 
 static int agg_config (oconfig_item_t *ci) /* {{{ */
 {
-  int i;
-
   pthread_mutex_lock (&agg_instance_list_lock);
 
   if (lookup == NULL)
@@ -694,7 +689,7 @@ static int agg_config (oconfig_item_t *ci) /* {{{ */
     }
   }
 
-  for (i = 0; i < ci->children_num; i++)
+  for (int i = 0; i < ci->children_num; i++)
   {
     oconfig_item_t *child = ci->children + i;
 
@@ -712,7 +707,6 @@ static int agg_config (oconfig_item_t *ci) /* {{{ */
 
 static int agg_read (void) /* {{{ */
 {
-  agg_instance_t *this;
   cdtime_t t;
   int success;
 
@@ -733,7 +727,7 @@ static int agg_read (void) /* {{{ */
     return (0);
   }
 
-  for (this = agg_instance_list_head; this != NULL; this = this->next)
+  for (agg_instance_t *this = agg_instance_list_head; this != NULL; this = this->next)
   {
     int status;