tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant function

This commit is contained in:
Gunnar Beutner 2015-03-02 12:44:15 +01:00
parent 81e821b60c
commit d913089a14
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/base/json.cpp
View File

@ -278,7 +278,7 @@ static int DecodeStartMap(void *ctx)
return 1; return 1;
} }
static int DecodeEndMap(void *ctx) static int DecodeEndMapOrArray(void *ctx)
{ {
JsonContext *context = static_cast<JsonContext *>(ctx); JsonContext *context = static_cast<JsonContext *>(ctx);
@ -306,20 +306,6 @@ static int DecodeStartArray(void *ctx)
return 1; return 1;
} }
static int DecodeEndArray(void *ctx)
{
JsonContext *context = static_cast<JsonContext *>(ctx);
try {
context->AddValue(context->Pop().EValue);
} catch (...) {
context->SaveException();
return 0;
}
return 1;
}
Value icinga::JsonDecode(const String& data) Value icinga::JsonDecode(const String& data)
{ {
static const yajl_callbacks callbacks = { static const yajl_callbacks callbacks = {
@ -331,9 +317,9 @@ Value icinga::JsonDecode(const String& data)
DecodeString, DecodeString,
DecodeStartMap, DecodeStartMap,
DecodeString, DecodeString,
DecodeEndMap, DecodeEndMapOrArray,
DecodeStartArray, DecodeStartArray,
DecodeEndArray DecodeEndMapOrArray
}; };
yajl_handle handle; yajl_handle handle;