From: Florian Forster Date: Tue, 5 Jul 2011 14:28:10 +0000 (+0200) Subject: curl_json plugin: Add compatibility code for libyajl v2. X-Git-Tag: collectd-4.10.4~17 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5ec7a37c81d6f64f35b1f35e2f0e3157e83f2718;p=collectd.git curl_json plugin: Add compatibility code for libyajl v2. Thanks to "spupykin" of the Arch Linux project on whose patch this commit is loosely based. --- diff --git a/configure.in b/configure.in index 5c3564c4..88cdb50f 100644 --- a/configure.in +++ b/configure.in @@ -3607,6 +3607,7 @@ then CPPFLAGS="$CPPFLAGS $with_libyajl_cppflags" AC_CHECK_HEADERS(yajl/yajl_parse.h, [with_libyajl="yes"], [with_libyajl="no (yajl/yajl_parse.h not found)"]) + AC_CHECK_HEADERS(yajl/yajl_version.h) CPPFLAGS="$SAVE_CPPFLAGS" fi diff --git a/src/curl_json.c b/src/curl_json.c index 55d4cd53..55527282 100644 --- a/src/curl_json.c +++ b/src/curl_json.c @@ -1,7 +1,7 @@ /** * collectd - src/curl_json.c * Copyright (C) 2009 Doug MacEachern - * Copyright (C) 2006-2010 Florian octo Forster + * Copyright (C) 2006-2011 Florian octo Forster * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -18,7 +18,7 @@ * * Authors: * Doug MacEachern - * Florian octo Forster + * Florian octo Forster **/ #include "collectd.h" @@ -29,6 +29,13 @@ #include #include +#if HAVE_YAJL_YAJL_VERSION_H +# include +#endif + +#if defined(YAJL_MAJOR) && (YAJL_MAJOR > 1) +# define HAVE_YAJL_V2 1 +#endif #define CJ_DEFAULT_HOST "localhost" #define CJ_KEY_MAGIC 0x43484b59UL /* CHKY */ @@ -77,6 +84,12 @@ struct cj_s /* {{{ */ }; typedef struct cj_s cj_t; /* }}} */ +#if HAVE_YAJL_V2 +typedef size_t yajl_len_t; +#else +typedef unsigned int yajl_len_t; +#endif + static int cj_read (user_data_t *ud); static int cj_curl_perform (cj_t *db, CURL *curl); static void cj_submit (cj_t *db, cj_key_t *key, value_t *value); @@ -100,11 +113,17 @@ static size_t cj_curl_callback (void *buf, /* {{{ */ 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); +#endif if (status != yajl_status_ok) { @@ -136,7 +155,7 @@ static int cj_get_type (cj_key_t *key) /* "number" may not be null terminated, so copy it into a buffer before * parsing. */ static int cj_cb_number (void *ctx, - const char *number, unsigned int number_len) + const char *number, yajl_len_t number_len) { char buffer[number_len + 1]; @@ -183,7 +202,7 @@ static int cj_cb_number (void *ctx, } /* int cj_cb_number */ static int cj_cb_map_key (void *ctx, const unsigned char *val, - unsigned int len) + yajl_len_t len) { cj_t *db = (cj_t *)ctx; c_avl_tree_t *tree; @@ -211,7 +230,7 @@ static int cj_cb_map_key (void *ctx, const unsigned char *val, } static int cj_cb_string (void *ctx, const unsigned char *val, - unsigned int len) + yajl_len_t len) { cj_t *db = (cj_t *)ctx; c_avl_tree_t *tree; @@ -761,7 +780,13 @@ static int cj_curl_perform (cj_t *db, CURL *curl) /* {{{ */ char *url; yajl_handle yprev = db->yajl; - db->yajl = yajl_alloc (&ycallbacks, NULL, NULL, (void *)db); + db->yajl = yajl_alloc (&ycallbacks, +#if HAVE_YAJL_V2 + /* alloc funcs = */ NULL, +#else + /* alloc funcs = */ NULL, NULL, +#endif + /* context = */ (void *)db); if (db->yajl == NULL) { ERROR ("curl_json plugin: yajl_alloc failed.");