X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbind.c;h=a246f1aacfb10fc87e3e25d87b52513293e2ea82;hb=965115a9ec6d4beaea5c6c1483176b80445c5f96;hp=b01263929815269614c491a89bbd4a2f70a98c94;hpb=e3d3699f39ab5f228e1be4ad32fe01b3a307a8ed;p=collectd.git diff --git a/src/bind.c b/src/bind.c index b0126392..a246f1aa 100644 --- a/src/bind.c +++ b/src/bind.c @@ -43,8 +43,8 @@ #include "collectd.h" -#include "common.h" #include "plugin.h" +#include "utils/common/common.h" #include @@ -343,8 +343,6 @@ static int bind_xml_read_derive(xmlDoc *doc, xmlNode *node, /* {{{ */ int status = parse_value(str_ptr, &value, DS_TYPE_DERIVE); if (status != 0) { - ERROR("bind plugin: Parsing string \"%s\" to derive value failed.", - str_ptr); xmlFree(str_ptr); return -1; } @@ -1540,8 +1538,9 @@ static int bind_init(void) /* {{{ */ curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 50L); #ifdef HAVE_CURLOPT_TIMEOUT_MS curl_easy_setopt(curl, CURLOPT_TIMEOUT_MS, - (timeout >= 0) ? (long)timeout : (long)CDTIME_T_TO_MS( - plugin_get_interval())); + (timeout >= 0) + ? (long)timeout + : (long)CDTIME_T_TO_MS(plugin_get_interval())); #endif return 0;