- if ((n_ds_name = malloc(strlen(ds_name)+1)) == NULL)
- {
- ERROR ("Unable to allocate memory for normalized datasource name buffer");
- return (-1);
- }
-
- if (ds_name && ds_name[0] != '\0') {
- if (mangle_dots(n_ds_name, ds_name) == -1)
+ if (type_instance && type_instance[0] != '\0') {
+ if ((n_type_instance = malloc(strlen(type_instance)+1)) == NULL)
+ {
+ ERROR ("Unable to allocate memory for normalized datasource name buffer");
+ return (-1);
+ }
+ if (mangle_dots(n_type_instance, type_instance) == -1)
{
if ((ds_name == NULL) || (ds_name[0] == '\0'))
status = ssnprintf (ret, ret_len, "%s.%s.%s.%s",
prefix, n_hostname, plugin, type);
else
status = ssnprintf (ret, ret_len, "%s.%s.%s.%s.%s",
{
if ((ds_name == NULL) || (ds_name[0] == '\0'))
status = ssnprintf (ret, ret_len, "%s.%s.%s.%s",
prefix, n_hostname, plugin, type);
else
status = ssnprintf (ret, ret_len, "%s.%s.%s.%s.%s",
- prefix, n_hostname, plugin, type, n_ds_name);
+ prefix, n_hostname, plugin, type, ds_name);
}
else
{
if ((ds_name == NULL) || (ds_name[0] == '\0'))
status = ssnprintf (ret, ret_len, "%s.%s.%s.%s-%s",
prefix, n_hostname, plugin, type,
}
else
{
if ((ds_name == NULL) || (ds_name[0] == '\0'))
status = ssnprintf (ret, ret_len, "%s.%s.%s.%s-%s",
prefix, n_hostname, plugin, type,
else
status = ssnprintf (ret, ret_len, "%s.%s.%s.%s-%s.%s",
prefix, n_hostname, plugin, type,
else
status = ssnprintf (ret, ret_len, "%s.%s.%s.%s-%s.%s",
prefix, n_hostname, plugin, type,
{
if ((ds_name == NULL) || (ds_name[0] == '\0'))
status = ssnprintf (ret, ret_len, "%s.%s.%s.%s.%s",
{
if ((ds_name == NULL) || (ds_name[0] == '\0'))
status = ssnprintf (ret, ret_len, "%s.%s.%s.%s.%s",
else
status = ssnprintf (ret, ret_len, "%s.%s.%s.%s.%s.%s",
prefix, n_hostname, plugin,
else
status = ssnprintf (ret, ret_len, "%s.%s.%s.%s.%s.%s",
prefix, n_hostname, plugin,
}
else
{
if ((ds_name == NULL) || (ds_name[0] == '\0'))
status = ssnprintf (ret, ret_len, "%s.%s.%s.%s.%s-%s",
prefix, n_hostname, plugin,
}
else
{
if ((ds_name == NULL) || (ds_name[0] == '\0'))
status = ssnprintf (ret, ret_len, "%s.%s.%s.%s.%s-%s",
prefix, n_hostname, plugin,
else
status = ssnprintf (ret, ret_len, "%s.%s.%s.%s.%s-%s.%s",
prefix, n_hostname, plugin,
else
status = ssnprintf (ret, ret_len, "%s.%s.%s.%s.%s-%s.%s",
prefix, n_hostname, plugin,
- plugin_instance, type, type_instance, n_ds_name);
+ plugin_instance, type, n_type_instance, ds_name);