X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcurl_json.c;h=1c225f79cec84de3e155e825e9367f6f5e405ab4;hb=0003c4d3c184f0f437499d6073cd023dc7b659c2;hp=292b262cc16cd99dca803568af191eaf42150f9a;hpb=bce14a848714aa347c0eab462e952d86c3347da6;p=collectd.git diff --git a/src/curl_json.c b/src/curl_json.c index 292b262c..1c225f79 100644 --- a/src/curl_json.c +++ b/src/curl_json.c @@ -552,7 +552,6 @@ static int cj_config_add_key (cj_t *db, /* {{{ */ db->tree = cj_avl_create(); tree = db->tree; - name = key->path; ptr = key->path; if (*ptr == '/') ++ptr; @@ -651,14 +650,16 @@ static int cj_init_curl (cj_t *db) /* {{{ */ if (db->post_body != NULL) curl_easy_setopt (db->curl, CURLOPT_POSTFIELDS, db->post_body); +#ifdef HAVE_CURLOPT_TIMEOUT_MS if (db->timeout >= 0) - curl_easy_setopt (db->curl, CURLOPT_TIMEOUT_MS, db->timeout); + curl_easy_setopt (db->curl, CURLOPT_TIMEOUT_MS, (long) db->timeout); else if (db->interval > 0) curl_easy_setopt (db->curl, CURLOPT_TIMEOUT_MS, CDTIME_T_TO_MS(db->timeout)); else curl_easy_setopt (db->curl, CURLOPT_TIMEOUT_MS, CDTIME_T_TO_MS(plugin_get_interval())); +#endif return (0); } /* }}} int cj_init_curl */