X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcurl_json.c;h=19efc5d6fd54f0f119ff1ef0bfcec9d445a7b541;hb=9de042657fa536305c5d98ef114dd9750ed4d656;hp=2ddaff3594d47663277deb886603e290a1363723;hpb=c7b0f0b0267f2ab7c84eea8306f0a516f5b8f769;p=collectd.git

diff --git a/src/curl_json.c b/src/curl_json.c
index 2ddaff35..19efc5d6 100644
--- a/src/curl_json.c
+++ b/src/curl_json.c
@@ -111,16 +111,9 @@ static size_t cj_curl_callback (void *buf, /* {{{ */
   if (db == NULL)
     return (0);
 
-  status = yajl_parse(db->yajl, (unsigned char *) buf, len);
+  status = yajl_parse(db->yajl, (unsigned char *)buf, len);
   if (status == yajl_status_ok)
-  {
-#if HAVE_YAJL_V2
-    status = yajl_complete_parse(db->yajl);
-#else
-    status = yajl_parse_complete(db->yajl);
-#endif
     return (len);
-  }
 #if !HAVE_YAJL_V2
   else if (status == yajl_status_insufficient_data)
     return (len);
@@ -770,7 +763,7 @@ static int cj_curl_perform (cj_t *db, CURL *curl) /* {{{ */
   curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &url);
 
   status = curl_easy_perform (curl);
-  if (status != 0)
+  if (status != CURLE_OK)
   {
     ERROR ("curl_json plugin: curl_easy_perform failed with status %i: %s (%s)",
            status, db->curl_errbuf, (url != NULL) ? url : "<null>");