rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-18 18:00:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

use json_object_object_get_ex() when available

Browse Source 
... because the previous call is now deprecated
This commit is contained in:
Rainer Gerhards 2014-09-30 16:55:40 +02:00
parent b34c35e38f
commit 3c250f3079
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -41,6 +41,7 @@ AC_CHECK_FUNCS(json_object_new_int64,,)
# look for newer API
AC_CHECK_FUNCS(json_tokener_error_desc,,)
AC_CHECK_FUNCS(json_object_object_get_ex,,)
case "${host}" in
*-*-linux*)

18
runtime/msg.c
View File

@ -2744,7 +2744,8 @@ getJSONPropVal(msg_t * const pMsg, msgPropDescr_t *pProp, uchar **pRes, rs_size_
} else {
leaf = jsonPathGetLeaf(pProp->name, pProp->nameLen);
CHKiRet(jsonPathFindParent(jroot, pProp->name, leaf, &parent, 1));
field = json_object_object_get(parent, (char*)leaf);
if(RS_json_object_object_get_ex(parent, (char*)leaf, &field) == (json_bool)FALSE)
field = NULL;
}
if(field != NULL) {
*pRes = (uchar*) strdup(json_object_get_string(field));
@ -2797,8 +2798,7 @@ msgGetJSONPropJSON(msg_t * const pMsg, msgPropDescr_t *pProp, struct json_object
}
leaf = jsonPathGetLeaf(pProp->name, pProp->nameLen);
CHKiRet(jsonPathFindParent(jroot, pProp->name, leaf, &parent, 1));
*pjson = json_object_object_get(parent, (char*)leaf);
if(*pjson == NULL) {
if(RS_json_object_object_get_ex(parent, (char*)leaf, pjson) == (json_bool)FALSE) {
ABORT_FINALIZE(RS_RET_NOT_FOUND);
}
@ -4161,7 +4161,8 @@ jsonPathFindNext(struct json_object *root, uchar *namestart, uchar **name, uchar
namebuf[i] = *p;
if(i > 0) {
namebuf[i] = '\0';
json = json_object_object_get(root, (char*)namebuf);
if(RS_json_object_object_get_ex(root, (char*)namebuf, &json) == (json_bool)FALSE)
json = NULL;
} else
json = root;
if(json == NULL) {
@ -4230,7 +4231,8 @@ jsonFind(struct json_object *jroot, msgPropDescr_t *pProp, struct json_object **
} else {
leaf = jsonPathGetLeaf(pProp->name, pProp->nameLen);
CHKiRet(jsonPathFindParent(jroot, pProp->name, leaf, &parent, 0));
field = json_object_object_get(parent, (char*)leaf);
if(RS_json_object_object_get_ex(parent, (char*)leaf, &field) == (json_bool)FALSE)
field = NULL;
}
*jsonres = field;
@ -4275,7 +4277,8 @@ msgAddJSON(msg_t * const pM, uchar *name, struct json_object *json)
json_object_put(json);
ABORT_FINALIZE(RS_RET_INVLD_SETOP);
}
leafnode = json_object_object_get(parent, (char*)leaf);
if(RS_json_object_object_get_ex(parent, (char*)leaf, &leafnode) == (json_bool)FALSE)
leafnode = NULL;
if(leafnode == NULL) {
json_object_object_add(parent, (char*)leaf, json);
} else {
@ -4350,7 +4353,8 @@ msgDelJSON(msg_t * const pM, uchar *name)
}
leaf = jsonPathGetLeaf(name, ustrlen(name));
CHKiRet(jsonPathFindParent(*jroot, name, leaf, &parent, 1));
leafnode = json_object_object_get(parent, (char*)leaf);
if(RS_json_object_object_get_ex(parent, (char*)leaf, &leafnode) == (json_bool)FALSE)
leafnode = NULL;
if(leafnode == NULL) {
DBGPRINTF("unset JSON: could not find '%s'\n", name);
ABORT_FINALIZE(RS_RET_JNAME_NOTFOUND);

12
runtime/rsyslog.h
View File

@ -594,6 +594,16 @@ rsRetVal rsrtExit(void);
int rsrtIsInit(void);
void rsrtSetErrLogger(void (*errLogger)(const int, const int, const uchar*));
/* our own support for breaking changes in json-c */
#ifdef HAVE_JSON_OBJECT_OBJECT_GET_EX
# define RS_json_object_object_get_ex(obj, key, retobj) \
json_object_object_get_ex((obj), (key), (retobj))
#else
# define RS_json_object_object_get_ex(obj, key, retobj) \
((*(retobj) = json_object_object_get((obj), (key))) == NULL) ? (json_bool)FALSE : (json_bool)TRUE
#endif
/* this define below is (later) intended to be used to implement empty
* structs. TODO: check if compilers supports this and, if not, define
* a dummy variable. This requires review of where in code empty structs
@ -607,5 +617,3 @@ extern rsconf_t *ourConf; /* defined by syslogd.c, a hack for functions that do
compile and change... -- rgerhars, 2011-04-19 */
#endif /* multi-include protection */
/* vim:set ai:
*/