SHA256
1
0
forked from pool/collectd
Stefan Schubert 2011-10-17 09:20:44 +00:00 committed by Git OBS Bridge
parent a7df4f3e01
commit 8dc9feb5fa
3 changed files with 31 additions and 0 deletions

View File

@ -0,0 +1,24 @@
--- src/curl_json.c
+++ src/curl_json.c
@@ -100,11 +100,9 @@
status = yajl_parse(db->yajl, (unsigned char *)buf, len);
if (status == yajl_status_ok)
{
- status = yajl_parse_complete(db->yajl);
+ status = yajl_complete_parse(db->yajl);
return (len);
}
- else if (status == yajl_status_insufficient_data)
- return (len);
if (status != yajl_status_ok)
{
@@ -760,7 +758,7 @@
char *url;
yajl_handle yprev = db->yajl;
- db->yajl = yajl_alloc (&ycallbacks, NULL, NULL, (void *)db);
+ db->yajl = yajl_alloc (&ycallbacks, NULL, (void *)db);
if (db->yajl == NULL)
{
ERROR ("curl_json plugin: yajl_alloc failed.");

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Oct 17 09:19:25 UTC 2011 - schubi@suse.com
- fixed build ( new yajl lib API )
-------------------------------------------------------------------
Fri Sep 16 14:35:10 UTC 2011 - coolo@suse.com

View File

@ -147,6 +147,7 @@ Patch24: collectd-pkgconfig_libnotify_add_gtk.patch
Patch25: collectd-df-remove-duplicates.patch
Patch26: collectd-iptc.diff
Patch27: collectd-libnotify_070.patch
Patch28: collectd-fix_new_yajl_lib.patch
Url: http://collectd.org/
Group: System/Monitoring
License: GNU General Public License (GPL)
@ -516,6 +517,7 @@ popd #iproute2
%patch25 -p1
%patch -P 26 -p1
%patch27 -p1
%patch28
%__sed -i 's|@@VERSION@@|%{version}|g' configure.in