X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftarget_set.c;h=73ca49fb8f071f898f328907c4aedb3a20f89ec0;hb=ff9e11ade5cfabf32c63fb19fc76cbbc4186bc5b;hp=5e9d0877c6c1f9a77f4e6eecaba70b5af132fd62;hpb=16c20a278d3b08f4f4288e30e14d8aea2f648710;p=collectd.git

diff --git a/src/target_set.c b/src/target_set.c
index 5e9d0877..73ca49fb 100644
--- a/src/target_set.c
+++ b/src/target_set.c
@@ -103,15 +103,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) /* {{{ */
@@ -142,13 +144,12 @@ static int ts_create (const oconfig_item_t *ci, void **user_data) /* {{{ */
   int status;
   int i;
 
-  data = (ts_data_t *) malloc (sizeof (*data));
+  data = calloc (1, sizeof (*data));
   if (data == NULL)
   {
-    ERROR ("ts_create: malloc failed.");
+    ERROR ("ts_create: calloc failed.");
     return (-ENOMEM);
   }
-  memset (data, 0, sizeof (*data));
 
   data->host = NULL;
   data->plugin = NULL;
@@ -177,6 +178,9 @@ static int ts_create (const oconfig_item_t *ci, void **user_data) /* {{{ */
       status = ts_config_add_string (&data->type, child,
           /* may be empty = */ 0);
 #endif
+    else if (strcasecmp ("TypeInstance", child->key) == 0)
+      status = ts_config_add_string (&data->type_instance, child,
+          /* may be empty = */ 1);
     else if (strcasecmp ("MetaDataSet", child->key) == 0)
       status = ts_config_add_meta (&data->meta, child,
           /* may be empty = */ 1);
@@ -235,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);
   }