curl_json plugin: Remove unused field from cj_t.

[collectd.git] / src / curl_json.c

diff --git a/src/curl_json.c b/src/curl_json.c
index 8e09bd8..464c6ae 100644 (file)
--- a/src/curl_json.c
+++ b/src/curl_json.c
@@ -86,7 +86,6 @@ struct cj_s /* {{{ */
 
   yajl_handle yajl;
   c_avl_tree_t *tree;
-  cj_key_t *key;
   int depth;
   struct {
     union {
@@ -600,7 +599,7 @@ static int cj_init_curl(cj_t *db) /* {{{ */
     curl_easy_setopt(db->curl, CURLOPT_TIMEOUT_MS, (long)db->timeout);
   else if (db->interval > 0)
     curl_easy_setopt(db->curl, CURLOPT_TIMEOUT_MS,
-                     (long)CDTIME_T_TO_MS(db->timeout));
+                     (long)CDTIME_T_TO_MS(db->interval));
   else
     curl_easy_setopt(db->curl, CURLOPT_TIMEOUT_MS,
                      (long)CDTIME_T_TO_MS(plugin_get_interval()));
@@ -923,7 +922,6 @@ static int cj_read(user_data_t *ud) /* {{{ */
   db->depth = 0;
   memset(&db->state, 0, sizeof(db->state));
   db->state[db->depth].tree = db->tree;
-  db->key = NULL;
 
   return cj_perform(db);
 } /* }}} int cj_read */