projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
threshold plugin: Fix "Dead assignment" warnings.
[collectd.git]
/
src
/
curl_xml.c
diff --git
a/src/curl_xml.c
b/src/curl_xml.c
index
5adaf06
..
44e920c
100644
(file)
--- a/
src/curl_xml.c
+++ b/
src/curl_xml.c
@@
-341,6
+341,7
@@
static int cx_handle_single_value_xpath (xmlXPathContextPtr xpath_ctx, /* {{{ */
/* free up object */
xmlXPathFreeObject (values_node_obj);
/* free up object */
xmlXPathFreeObject (values_node_obj);
+ sfree (node_value);
/* We have reached here which means that
* we have got something to work */
/* We have reached here which means that
* we have got something to work */
@@
-385,7
+386,7
@@
static int cx_handle_instance_xpath (xmlXPathContextPtr xpath_ctx, /* {{{ */
/* If the base xpath returns more than one block, the result is assumed to be
* a table. The `Instance' option is not optional in this case. Check for the
* condition and inform the user. */
/* If the base xpath returns more than one block, the result is assumed to be
* a table. The `Instance' option is not optional in this case. Check for the
* condition and inform the user. */
- if (is_table && (
vl->type_
instance == NULL))
+ if (is_table && (
xpath->
instance == NULL))
{
WARNING ("curl_xml plugin: "
"Base-XPath %s is a table (more than one result was returned), "
{
WARNING ("curl_xml plugin: "
"Base-XPath %s is a table (more than one result was returned), "
@@
-438,8
+439,12
@@
static int cx_handle_instance_xpath (xmlXPathContextPtr xpath_ctx, /* {{{ */
if (xpath->instance_prefix != NULL)
{
if (instance_node != NULL)
if (xpath->instance_prefix != NULL)
{
if (instance_node != NULL)
+ {
+ char *node_value = (char *) xmlNodeGetContent(instance_node->nodeTab[0]);
ssnprintf (vl->type_instance, sizeof (vl->type_instance),"%s%s",
ssnprintf (vl->type_instance, sizeof (vl->type_instance),"%s%s",
- xpath->instance_prefix, (char *) xmlNodeGetContent(instance_node->nodeTab[0]));
+ xpath->instance_prefix, node_value);
+ sfree (node_value);
+ }
else
sstrncpy (vl->type_instance, xpath->instance_prefix,
sizeof (vl->type_instance));
else
sstrncpy (vl->type_instance, xpath->instance_prefix,
sizeof (vl->type_instance));
@@
-449,8
+454,11
@@
static int cx_handle_instance_xpath (xmlXPathContextPtr xpath_ctx, /* {{{ */
/* If instance_prefix and instance_node are NULL, then
* don't set the type_instance */
if (instance_node != NULL)
/* If instance_prefix and instance_node are NULL, then
* don't set the type_instance */
if (instance_node != NULL)
- sstrncpy (vl->type_instance, (char *) xmlNodeGetContent(instance_node->nodeTab[0]),
- sizeof (vl->type_instance));
+ {
+ char *node_value = (char *) xmlNodeGetContent(instance_node->nodeTab[0]);
+ sstrncpy (vl->type_instance, node_value, sizeof (vl->type_instance));
+ sfree (node_value);
+ }
}
/* Free `instance_node_obj' this late, because `instance_node' points to
}
/* Free `instance_node_obj' this late, because `instance_node' points to
@@
-608,6
+616,7
@@
static int cx_curl_perform (cx_t *db, CURL *curl) /* {{{ */
long rc;
char *ptr;
char *url;
long rc;
char *ptr;
char *url;
+ url = db->url;
db->buffer_fill = 0;
status = curl_easy_perform (curl);
db->buffer_fill = 0;
status = curl_easy_perform (curl);
@@
-1032,9
+1041,18
@@
static int cx_config (oconfig_item_t *ci) /* {{{ */
return (0);
} /* }}} int cx_config */
return (0);
} /* }}} int cx_config */
+static int cx_init (void) /* {{{ */
+{
+ /* Call this while collectd is still single-threaded to avoid
+ * initialization issues in libgcrypt. */
+ curl_global_init (CURL_GLOBAL_SSL);
+ return (0);
+} /* }}} int cx_init */
+
void module_register (void)
{
plugin_register_complex_config ("curl_xml", cx_config);
void module_register (void)
{
plugin_register_complex_config ("curl_xml", cx_config);
+ plugin_register_init ("curl_xml", cx_init);
} /* void module_register */
/* vim: set sw=2 sts=2 et fdm=marker : */
} /* void module_register */
/* vim: set sw=2 sts=2 et fdm=marker : */