X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftarget_set.c;h=fee5ffdcbaac2e09e719cd9d9460f5f3cc21de7f;hb=37d3677e95febc653d8f67fc19f67eb4110910eb;hp=99f8aa6a53a9dc189dfa4520ee4f0059d57d373a;hpb=e030096e4f5a0bbdd42635bfeb95e39d150cac72;p=collectd.git

diff --git a/src/target_set.c b/src/target_set.c
index 99f8aa6a..fee5ffdc 100644
--- a/src/target_set.c
+++ b/src/target_set.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "filter_chain.h"
 
@@ -39,7 +40,7 @@ struct ts_data_s
 };
 typedef struct ts_data_s ts_data_t;
 
-int ts_util_get_key_and_string_wo_strdup (const oconfig_item_t *ci, char **ret_key, char **ret_string) /* {{{ */
+static int ts_util_get_key_and_string_wo_strdup (const oconfig_item_t *ci, char **ret_key, char **ret_string) /* {{{ */
 {
   if ((ci->values_num != 2)
       || (ci->values[0].type != OCONFIG_TYPE_STRING)
@@ -103,15 +104,17 @@ static int ts_config_add_meta (meta_data_t **dest, /* {{{ */
     return (-1);
   }
 
-  if(NULL == (*dest)) {
+  if ((*dest) == NULL)
+  {
     // Create a new meta_data_t
-    if( NULL == (*dest = meta_data_create())) {
+    if ((*dest = meta_data_create()) == NULL)
+    {
       ERROR ("Target `set': failed to create a meta data for `%s'.", ci->key);
       return (-1);
     }
   }
 
-  return(meta_data_add_string (*dest, key, string));
+  return (meta_data_add_string (*dest, key, string));
 } /* }}} int ts_config_add_meta */
 
 static int ts_destroy (void **user_data) /* {{{ */
@@ -140,7 +143,6 @@ static int ts_create (const oconfig_item_t *ci, void **user_data) /* {{{ */
 {
   ts_data_t *data;
   int status;
-  int i;
 
   data = calloc (1, sizeof (*data));
   if (data == NULL)
@@ -157,7 +159,7 @@ static int ts_create (const oconfig_item_t *ci, void **user_data) /* {{{ */
   data->meta = NULL;
 
   status = 0;
-  for (i = 0; i < ci->children_num; i++)
+  for (int i = 0; i < ci->children_num; i++)
   {
     oconfig_item_t *child = ci->children + i;
 
@@ -237,7 +239,8 @@ static int ts_invoke (const data_set_t *ds, value_list_t *vl, /* {{{ */
     return (-EINVAL);
   }
 
-  if(NULL != data->meta) {
+  if (data->meta != NULL)
+  {
     meta_data_clone_merge(&(vl->meta), data->meta);
   }
 
@@ -253,9 +256,8 @@ static int ts_invoke (const data_set_t *ds, value_list_t *vl, /* {{{ */
 
 void module_register (void)
 {
-	target_proc_t tproc;
+	target_proc_t tproc = { 0 };
 
-	memset (&tproc, 0, sizeof (tproc));
 	tproc.create  = ts_create;
 	tproc.destroy = ts_destroy;
 	tproc.invoke  = ts_invoke;