projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1455 from rubenk/configure-ac-remove-dead-code
[collectd.git]
/
src
/
virt.c
diff --git
a/src/virt.c
b/src/virt.c
index
69a4607
..
6824b13
100644
(file)
--- a/
src/virt.c
+++ b/
src/virt.c
@@
-128,7
+128,7
@@
enum plginst_field {
};
static enum plginst_field plugin_instance_format[PLGINST_MAX_FIELDS] =
};
static enum plginst_field plugin_instance_format[PLGINST_MAX_FIELDS] =
- { plginst_n
am
e };
+ { plginst_n
on
e };
/* InterfaceFormat. */
enum if_field {
/* InterfaceFormat. */
enum if_field {
@@
-417,8
+417,8
@@
lv_config (const char *key, const char *value)
else if (strcasecmp (fields[i], "uuid") == 0)
hostname_format[i] = hf_uuid;
else {
else if (strcasecmp (fields[i], "uuid") == 0)
hostname_format[i] = hf_uuid;
else {
- sfree (value_copy);
ERROR (PLUGIN_NAME " plugin: unknown HostnameFormat field: %s", fields[i]);
ERROR (PLUGIN_NAME " plugin: unknown HostnameFormat field: %s", fields[i]);
+ sfree (value_copy);
return -1;
}
}
return -1;
}
}
@@
-449,13
+449,16
@@
lv_config (const char *key, const char *value)
}
for (i = 0; i < n; ++i) {
}
for (i = 0; i < n; ++i) {
- if (strcasecmp (fields[i], "name") == 0)
+ if (strcasecmp (fields[i], "none") == 0) {
+ plugin_instance_format[i] = plginst_none;
+ break;
+ } else if (strcasecmp (fields[i], "name") == 0)
plugin_instance_format[i] = plginst_name;
else if (strcasecmp (fields[i], "uuid") == 0)
plugin_instance_format[i] = plginst_uuid;
else {
plugin_instance_format[i] = plginst_name;
else if (strcasecmp (fields[i], "uuid") == 0)
plugin_instance_format[i] = plginst_uuid;
else {
- sfree (value_copy);
ERROR (PLUGIN_NAME " plugin: unknown PluginInstanceFormat field: %s", fields[i]);
ERROR (PLUGIN_NAME " plugin: unknown PluginInstanceFormat field: %s", fields[i]);
+ sfree (value_copy);
return -1;
}
}
return -1;
}
}