X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-trace.c;h=d81e09c22a95c92fca244eba9a95222ff99bbd23;hb=77ca8b40f2d0c8b1cbf9960bd5a5b2aec36fef38;hp=7d4c81e31e9716a01e9105951c63483f85b05c8e;hpb=e17ae412245ba9afb33ff6a0f1f665b4d66d4da4;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-trace.c b/src/afb-trace.c
index 7d4c81e3..d81e09c2 100644
--- a/src/afb-trace.c
+++ b/src/afb-trace.c
@@ -27,6 +27,9 @@
 #include <pthread.h>
 
 #include <json-c/json.h>
+#if !defined(JSON_C_TO_STRING_NOSLASHESCAPE)
+#define JSON_C_TO_STRING_NOSLASHESCAPE 0
+#endif
 
 #define AFB_BINDING_VERSION 3
 #include <afb/afb-binding.h>
@@ -1487,7 +1490,7 @@ static void add_flags(void *closure, struct json_object *object, enum trace_type
 	if (wrap_json_unpack(object, "s", &name))
 		ctxt_error(&desc->context->errors, "unexpected %s value %s",
 					abstracting[type].name,
-					json_object_to_json_string(object));
+					json_object_to_json_string_ext(object, JSON_C_TO_STRING_NOSLASHESCAPE));
 	else {
 		queried = (name[0] == '*' && !name[1]) ? "all" : name;
 		value = abstracting[type].get_flag(queried);
@@ -1627,7 +1630,7 @@ static void drop_tag(void *closure, struct json_object *object)
 
 	rc = wrap_json_unpack(object, "s", &name);
 	if (rc)
-		ctxt_error(&context->errors, "unexpected tag value %s", json_object_to_json_string(object));
+		ctxt_error(&context->errors, "unexpected tag value %s", json_object_to_json_string_ext(object, JSON_C_TO_STRING_NOSLASHESCAPE));
 	else {
 		tag = trace_get_tag(context->trace, name, 0);
 		if (!tag)
@@ -1647,7 +1650,7 @@ static void drop_event(void *closure, struct json_object *object)
 
 	rc = wrap_json_unpack(object, "s", &name);
 	if (rc)
-		ctxt_error(&context->errors, "unexpected event value %s", json_object_to_json_string(object));
+		ctxt_error(&context->errors, "unexpected event value %s", json_object_to_json_string_ext(object, JSON_C_TO_STRING_NOSLASHESCAPE));
 	else {
 		event = trace_get_event(context->trace, name, 0);
 		if (!event)
@@ -1667,7 +1670,7 @@ static void drop_session(void *closure, struct json_object *object)
 
 	rc = wrap_json_unpack(object, "s", &uuid);
 	if (rc)
-		ctxt_error(&context->errors, "unexpected session value %s", json_object_to_json_string(object));
+		ctxt_error(&context->errors, "unexpected session value %s", json_object_to_json_string_ext(object, JSON_C_TO_STRING_NOSLASHESCAPE));
 	else {
 		session = trace_get_session_by_uuid(context->trace, uuid, 0);
 		if (!session)