summaryrefslogtreecommitdiff
path: root/runtime/msg.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2014-03-17 15:01:26 +0100
committerMichael Biebl <biebl@debian.org>2014-03-17 15:01:26 +0100
commit29b51b47d541217c16564ac1f8ecb4a6067c4dad (patch)
tree76016094935576363adcba5658c52ac33b78f5e8 /runtime/msg.c
parent29867b5cc18d25191fbbdcc4af4f79cc3a4da43e (diff)
downloadrsyslog-29b51b47d541217c16564ac1f8ecb4a6067c4dad.tar.gz
Imported Upstream version 7.6.2upstream/7.6.2
Diffstat (limited to 'runtime/msg.c')
-rw-r--r--runtime/msg.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/runtime/msg.c b/runtime/msg.c
index d04ce7b..8863a67 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -3817,7 +3817,6 @@ jsonPathFindNext(struct json_object *root, uchar *namestart, uchar **name, uchar
namebuf[i] = *p;
if(i > 0) {
namebuf[i] = '\0';
- dbgprintf("AAAA: next JSONPath elt: '%s'\n", namebuf);
json = json_object_object_get(root, (char*)namebuf);
} else
json = root;
@@ -3857,7 +3856,6 @@ jsonMerge(struct json_object *existing, struct json_object *json)
struct json_object_iter it;
json_object_object_foreachC(json, it) {
-DBGPRINTF("AAAA jsonMerge adds '%s'\n", it.key);
json_object_object_add(existing, it.key,
json_object_get(it.val));
}
@@ -3940,7 +3938,6 @@ msgAddJSON(msg_t * const pM, uchar *name, struct json_object *json)
if(json_object_get_type(json) == json_type_object) {
CHKiRet(jsonMerge(*pjroot, json));
} else {
-//dbgprintf("AAAA: leafnode already exists, type is %d, update with %d\n", (int)json_object_get_type(leafnode), (int)json_object_get_type(json));
/* TODO: improve the code below, however, the current
* state is not really bad */
if(json_object_get_type(leafnode) == json_type_object) {
@@ -3979,7 +3976,6 @@ msgDelJSON(msg_t * const pM, uchar *name)
uchar *leaf;
DEFiRet;
-dbgprintf("AAAA: unset variable '%s'\n", name);
MsgLock(pM);
if(name[0] == '!') {
@@ -4011,7 +4007,6 @@ dbgprintf("AAAA: unset variable '%s'\n", name);
leaf = jsonPathGetLeaf(name, ustrlen(name));
CHKiRet(jsonPathFindParent(*jroot, name, leaf, &parent, 1));
leafnode = json_object_object_get(parent, (char*)leaf);
-DBGPRINTF("AAAA: unset found JSON value path '%s', " "leaf '%s', leafnode %p\n", name, leaf, leafnode);
if(leafnode == NULL) {
DBGPRINTF("unset JSON: could not find '%s'\n", name);
ABORT_FINALIZE(RS_RET_JNAME_NOTFOUND);