X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdbi.c;h=7cab1d54e9c565addc07900e376ff3ee4b28eb68;hb=632cca47086de6cb23c32fc35802da1a19f40875;hp=d013e1410056e2b15415408fbb60466675720260;hpb=2079ee1517e34de372f58e7e2267ad5c71a8a41f;p=collectd.git

diff --git a/src/dbi.c b/src/dbi.c
index d013e141..7cab1d54 100644
--- a/src/dbi.c
+++ b/src/dbi.c
@@ -352,23 +352,20 @@ static int cdbi_config_add_database(oconfig_item_t *ci) /* {{{ */
       ERROR("dbi plugin: realloc failed");
       status = -1;
     } else {
-      char *name = NULL;
-
       databases = temp;
       databases[databases_num] = db;
       databases_num++;
 
-      name = ssnprintf_alloc("dbi:%s", db->name);
-
-      user_data_t ud = {.data = db};
-
+      char *name = ssnprintf_alloc("dbi:%s", db->name);
       plugin_register_complex_read(
           /* group = */ NULL,
           /* name = */ name ? name : db->name,
           /* callback = */ cdbi_read_database,
           /* interval = */ (db->interval > 0) ? db->interval : 0,
-          /* user_data = */ &ud);
-      free(name);
+          &(user_data_t){
+              .data = db,
+          });
+      sfree(name);
     }
   }
 
@@ -409,13 +406,13 @@ static int cdbi_init(void) /* {{{ */
 
   if (queries_num == 0) {
     ERROR("dbi plugin: No <Query> blocks have been found. Without them, "
-          "this plugin can't do anything useful, so we will returns an error.");
+          "this plugin can't do anything useful, so we will return an error.");
     return (-1);
   }
 
   if (databases_num == 0) {
     ERROR("dbi plugin: No <Database> blocks have been found. Without them, "
-          "this plugin can't do anything useful, so we will returns an error.");
+          "this plugin can't do anything useful, so we will return an error.");
     return (-1);
   }