tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-01 10:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix compatibility with older versions of the YAJL library

Browse Source 
refs #7454
This commit is contained in:
Gunnar Beutner 2014-10-28 05:55:08 +01:00
parent 185f9b4080
commit 65e2e636ea
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/base/json.cpp
View File

@ -25,6 +25,7 @@
#include "base/convert.hpp" #include "base/convert.hpp"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/exception_ptr.hpp> #include <boost/exception_ptr.hpp>
#include <yajl/yajl_version.h>
#include <yajl/yajl_gen.h> #include <yajl/yajl_gen.h>
#include <yajl/yajl_parse.h> #include <yajl/yajl_parse.h>
#include <stack> #include <stack>
@ -93,7 +94,13 @@ static void Encode(yajl_gen handle, const Value& value)
String icinga::JsonEncode(const Value& value) String icinga::JsonEncode(const Value& value)
{ {
#if YAJL_MAJOR < 2
yajl_gen_config conf = { 0, "" };
yajl_gen handle = yajl_gen_alloc(&conf, NULL);
#else /* YAJL_MAJOR */
yajl_gen handle = yajl_gen_alloc(NULL); yajl_gen handle = yajl_gen_alloc(NULL);
#endif /* YAJL_MAJOR */
Encode(handle, value); Encode(handle, value);
const unsigned char *buf; const unsigned char *buf;
@ -317,13 +324,24 @@ Value icinga::JsonDecode(const String& data)
}; };
yajl_handle handle; yajl_handle handle;
#if YAJL_MAJOR < 2
yajl_parser_config cfg = { 1, 0 };
#endif /* YAJL_MAJOR */
JsonContext context; JsonContext context;
#if YAJL_MAJOR < 2
handle = yajl_alloc(&callbacks, &cfg, NULL, &context);
#else /* YAJL_MAJOR */
handle = yajl_alloc(&callbacks, NULL, &context); handle = yajl_alloc(&callbacks, NULL, &context);
#endif /* YAJL_MAJOR */
yajl_parse(handle, reinterpret_cast<const unsigned char *>(data.CStr()), data.GetLength()); yajl_parse(handle, reinterpret_cast<const unsigned char *>(data.CStr()), data.GetLength());
#if YAJL_MAJOR < 2
if (yajl_parse_complete(handle) != yajl_status_ok) {
#else /* YAJL_MAJOR */
if (yajl_complete_parse(handle) != yajl_status_ok) { if (yajl_complete_parse(handle) != yajl_status_ok) {
#endif /* YAJL_MAJOR */
unsigned char *internal_err_str = yajl_get_error(handle, 1, reinterpret_cast<const unsigned char *>(data.CStr()), data.GetLength()); unsigned char *internal_err_str = yajl_get_error(handle, 1, reinterpret_cast<const unsigned char *>(data.CStr()), data.GetLength());
String msg = reinterpret_cast<char *>(internal_err_str); String msg = reinterpret_cast<char *>(internal_err_str);
yajl_free_error(handle, internal_err_str); yajl_free_error(handle, internal_err_str);