projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.4' into collectd-5.5
[collectd.git]
/
src
/
bind.c
diff --git
a/src/bind.c
b/src/bind.c
index
ec84df4
..
c5327f1
100644
(file)
--- a/
src/bind.c
+++ b/
src/bind.c
@@
-267,7
+267,7
@@
static void submit (time_t ts, const char *plugin_instance, /* {{{ */
if (type_instance) {
sstrncpy(vl.type_instance, type_instance,
sizeof(vl.type_instance));
if (type_instance) {
sstrncpy(vl.type_instance, type_instance,
sizeof(vl.type_instance));
- replace_special (vl.
plugin_instance, sizeof (vl.plugin
_instance));
+ replace_special (vl.
type_instance, sizeof (vl.type
_instance));
}
plugin_dispatch_values(&vl);
} /* }}} void submit */
}
plugin_dispatch_values(&vl);
} /* }}} void submit */
@@
-763,7
+763,7
@@
static int bind_xml_stats_handle_zone (int version, xmlDoc *doc, /* {{{ */
xmlFree (zone_name);
zone_name = NULL;
xmlFree (zone_name);
zone_name = NULL;
- if (j >= view
s
->zones_num)
+ if (j >= view->zones_num)
return (0);
zone_name = view->zones[j];
return (0);
zone_name = view->zones[j];
@@
-1666,7
+1666,7
@@
static int bind_config_add_view (oconfig_item_t *ci) /* {{{ */
if (tmp->name == NULL)
{
ERROR ("bind plugin: strdup failed.");
if (tmp->name == NULL)
{
ERROR ("bind plugin: strdup failed.");
-
free (tmp
);
+
sfree (views
);
return (-1);
}
return (-1);
}