Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
json-c: Remove escaping of slashs
[src/app-framework-binder.git]
/
src
/
afb-api-dbus.c
diff --git
a/src/afb-api-dbus.c
b/src/afb-api-dbus.c
index
a2c9b08
..
227658f
100644
(file)
--- a/
src/afb-api-dbus.c
+++ b/
src/afb-api-dbus.c
@@
-27,6
+27,9
@@
#include <systemd/sd-bus.h>
#include <json-c/json.h>
#include <systemd/sd-bus.h>
#include <json-c/json.h>
+#if !defined(JSON_C_TO_STRING_NOSLASHESCAPE)
+#define JSON_C_TO_STRING_NOSLASHESCAPE 0
+#endif
#include <afb/afb-event-x2.h>
#include <afb/afb-event-x2.h>
@@
-43,6
+46,7
@@
#include "afb-xreq.h"
#include "verbose.h"
#include "afb-xreq.h"
#include "verbose.h"
+
static const char DEFAULT_PATH_PREFIX[] = "/org/agl/afb/api/";
struct dbus_memo;
static const char DEFAULT_PATH_PREFIX[] = "/org/agl/afb/api/";
struct dbus_memo;
@@
-810,7
+814,7
@@
void dbus_req_raw_reply(struct afb_xreq *xreq, struct json_object *obj, const ch
int rc;
rc = sd_bus_reply_method_return(dreq->message, "sss",
int rc;
rc = sd_bus_reply_method_return(dreq->message, "sss",
- obj ? json_object_to_json_string_ext(obj, JSON_C_TO_STRING_PLAIN) : "",
+ obj ? json_object_to_json_string_ext(obj, JSON_C_TO_STRING_PLAIN
|JSON_C_TO_STRING_NOSLASHESCAPE
) : "",
error ? : "",
info ? : "");
if (rc < 0)
error ? : "",
info ? : "");
if (rc < 0)
@@
-892,7
+896,7
@@
static void afb_api_dbus_server_event_remove(void *closure, const char *event, i
static void afb_api_dbus_server_event_push(void *closure, const char *event, int eventid, struct json_object *object)
{
static void afb_api_dbus_server_event_push(void *closure, const char *event, int eventid, struct json_object *object)
{
- const char *data = json_object_to_json_string_ext(object, JSON_C_TO_STRING_PLAIN);
+ const char *data = json_object_to_json_string_ext(object, JSON_C_TO_STRING_PLAIN
|JSON_C_TO_STRING_NOSLASHESCAPE
);
afb_api_dbus_server_event_send(closure, '!', event, eventid, data, 0);
json_object_put(object);
}
afb_api_dbus_server_event_send(closure, '!', event, eventid, data, 0);
json_object_put(object);
}
@@
-904,7
+908,7
@@
static void afb_api_dbus_server_event_broadcast(void *closure, const char *event
api = closure;
rc = sd_bus_emit_signal(api->sdbus, api->path, api->name, "broadcast",
api = closure;
rc = sd_bus_emit_signal(api->sdbus, api->path, api->name, "broadcast",
- "ss", event, json_object_to_json_string_ext(object, JSON_C_TO_STRING_PLAIN));
+ "ss", event, json_object_to_json_string_ext(object, JSON_C_TO_STRING_PLAIN
|JSON_C_TO_STRING_NOSLASHESCAPE
));
if (rc < 0)
ERROR("error while broadcasting event %s", event);
json_object_put(object);
if (rc < 0)
ERROR("error while broadcasting event %s", event);
json_object_put(object);