projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Run clang-format after removing ssnprintf
[collectd.git]
/
src
/
bind.c
diff --git
a/src/bind.c
b/src/bind.c
index
02bffd3
..
49fb4d7
100644
(file)
--- a/
src/bind.c
+++ b/
src/bind.c
@@
-522,8
+522,10
@@
static int bind_parse_generic_name_value(const char *xpath_expression, /* {{{ */
status = bind_xml_read_gauge(doc, counter, &value.gauge);
else
status = bind_xml_read_derive(doc, counter, &value.derive);
status = bind_xml_read_gauge(doc, counter, &value.gauge);
else
status = bind_xml_read_derive(doc, counter, &value.derive);
- if (status != 0)
+ if (status != 0) {
+ xmlFree(name);
continue;
continue;
+ }
status = (*list_callback)(name, value, current_time, user_data);
if (status == 0)
status = (*list_callback)(name, value, current_time, user_data);
if (status == 0)
@@
-655,12
+657,16
@@
static int bind_parse_generic_name_attr_value_list(
status = bind_xml_read_gauge(doc, child, &value.gauge);
else
status = bind_xml_read_derive(doc, child, &value.derive);
status = bind_xml_read_gauge(doc, child, &value.gauge);
else
status = bind_xml_read_derive(doc, child, &value.derive);
- if (status != 0)
+ if (status != 0) {
+ xmlFree(attr_name);
continue;
continue;
+ }
status = (*list_callback)(attr_name, value, current_time, user_data);
if (status == 0)
num_entries++;
status = (*list_callback)(attr_name, value, current_time, user_data);
if (status == 0)
num_entries++;
+
+ xmlFree(attr_name);
}
}
}
}
@@
-731,8
+737,8
@@
static int bind_xml_stats_handle_zone(int version, xmlDoc *doc, /* {{{ */
nsstats_translation_table_length,
plugin_instance};
nsstats_translation_table_length,
plugin_instance};
- s
snprintf(plugin_instance, sizeof(plugin_instance), "%s-zone-%s"
,
-
view->name,
zone_name);
+ s
nprintf(plugin_instance, sizeof(plugin_instance), "%s-zone-%s", view->name
,
+ zone_name);
if (version == 3) {
list_info_ptr_t list_info = {plugin_instance,
if (version == 3) {
list_info_ptr_t list_info = {plugin_instance,
@@
-862,8
+868,7
@@
static int bind_xml_stats_handle_view(int version, xmlDoc *doc, /* {{{ */
list_info_ptr_t list_info = {plugin_instance,
/* type = */ "dns_qtype"};
list_info_ptr_t list_info = {plugin_instance,
/* type = */ "dns_qtype"};
- ssnprintf(plugin_instance, sizeof(plugin_instance), "%s-qtypes",
- view->name);
+ snprintf(plugin_instance, sizeof(plugin_instance), "%s-qtypes", view->name);
if (version == 3) {
bind_parse_generic_name_attr_value_list(
/* xpath = */ "counters[@type='resqtype']",
if (version == 3) {
bind_parse_generic_name_attr_value_list(
/* xpath = */ "counters[@type='resqtype']",
@@
-885,8
+890,8
@@
static int bind_xml_stats_handle_view(int version, xmlDoc *doc, /* {{{ */
resstats_translation_table_length,
plugin_instance};
resstats_translation_table_length,
plugin_instance};
- s
s
nprintf(plugin_instance, sizeof(plugin_instance), "%s-resolver_stats",
-
view->name);
+ snprintf(plugin_instance, sizeof(plugin_instance), "%s-resolver_stats",
+ view->name);
if (version == 3) {
bind_parse_generic_name_attr_value_list(
"counters[@type='resstats']",
if (version == 3) {
bind_parse_generic_name_attr_value_list(
"counters[@type='resstats']",
@@
-908,8
+913,8
@@
static int bind_xml_stats_handle_view(int version, xmlDoc *doc, /* {{{ */
list_info_ptr_t list_info = {plugin_instance,
/* type = */ "dns_qtype_cached"};
list_info_ptr_t list_info = {plugin_instance,
/* type = */ "dns_qtype_cached"};
- s
s
nprintf(plugin_instance, sizeof(plugin_instance), "%s-cache_rr_sets",
-
view->name);
+ snprintf(plugin_instance, sizeof(plugin_instance), "%s-cache_rr_sets",
+ view->name);
bind_parse_generic_name_value(/* xpath = */ "cache/rrset",
/* callback = */ bind_xml_list_callback,
bind_parse_generic_name_value(/* xpath = */ "cache/rrset",
/* callback = */ bind_xml_list_callback,