X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmysql.c;h=32b72e286a0b0d08a4f8202ad17ac8296601504a;hb=4a40badfaaa7f3b07e1d9654527ab9780c898819;hp=eea3df8df519c8480fb196b3762aada98f487f1d;hpb=6743e8a4e1bd0b627fee3a3e51226c07c3facbcb;p=collectd.git diff --git a/src/mysql.c b/src/mysql.c index eea3df8d..32b72e28 100644 --- a/src/mysql.c +++ b/src/mysql.c @@ -222,21 +222,22 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */ /* If all went well, register this database for reading */ if (status == 0) { - user_data_t ud = { 0 }; char cb_name[DATA_MAX_NAME_LEN]; DEBUG ("mysql plugin: Registering new read callback: %s", (db->database != NULL) ? db->database : ""); - ud.data = (void *) db; - ud.free_func = mysql_database_free; - if (db->instance != NULL) ssnprintf (cb_name, sizeof (cb_name), "mysql-%s", db->instance); else sstrncpy (cb_name, "mysql", sizeof (cb_name)); + user_data_t ud = { + .data = db, + .free_func = mysql_database_free + }; + plugin_register_complex_read (/* group = */ NULL, cb_name, mysql_read, /* interval = */ 0, &ud);