- /* TODO: Use FORMAT_VL() here. */
- ssnprintf (service_buffer, sizeof(service_buffer),
- "%s-%s-%s-%s-%s", vl->plugin, vl->plugin_instance,
- vl->type, vl->type_instance, ds->ds[index].name);
+ format_name (name_buffer, sizeof (name_buffer),
+ /* host = */ "", vl->plugin, vl->plugin_instance,
+ vl->type, vl->type_instance);
+ if (ds->ds_num > 1)
+ ssnprintf (service_buffer, sizeof (service_buffer),
+ "%s/%s", &name_buffer[1], ds->ds[index].name);
+ else
+ sstrncpy (service_buffer, &name_buffer[1],
+ sizeof (service_buffer));
+