X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-msg-json.c;h=6d8f73272d03c1341a3049e1161ac8023f9a7caa;hb=ae6f684d830871e81b0b4168424f6a4873eabbff;hp=7702eb63660bf85a999ee1b52fb3d09eeff855ed;hpb=a38382e89710db2c298f7f101e3ba0cf3681287c;p=src%2Fapp-framework-binder.git diff --git a/src/afb-msg-json.c b/src/afb-msg-json.c index 7702eb63..6d8f7327 100644 --- a/src/afb-msg-json.c +++ b/src/afb-msg-json.c @@ -29,15 +29,14 @@ struct json_object *afb_msg_json_reply(const char *status, const char *info, str { json_object *msg, *request; const char *token, *uuid; - static json_object *type_reply = NULL; + json_object *type_reply = NULL; msg = json_object_new_object(); if (resp != NULL) json_object_object_add(msg, "response", resp); - if (type_reply == NULL) - type_reply = json_object_new_string("afb-reply"); - json_object_object_add(msg, "jtype", json_object_get(type_reply)); + type_reply = json_object_new_string("afb-reply"); + json_object_object_add(msg, "jtype", type_reply); request = json_object_new_object(); json_object_object_add(msg, "request", request); @@ -75,7 +74,7 @@ struct json_object *afb_msg_json_reply_error(const char *status, const char *inf struct json_object *afb_msg_json_event(const char *event, struct json_object *object) { json_object *msg; - static json_object *type_event = NULL; + json_object *type_event = NULL; msg = json_object_new_object(); @@ -84,9 +83,8 @@ struct json_object *afb_msg_json_event(const char *event, struct json_object *ob if (object != NULL) json_object_object_add(msg, "data", object); - if (type_event == NULL) - type_event = json_object_new_string("afb-event"); - json_object_object_add(msg, "jtype", json_object_get(type_event)); + type_event = json_object_new_string("afb-event"); + json_object_object_add(msg, "jtype", type_event); return msg; } @@ -107,4 +105,14 @@ struct afb_arg afb_msg_json_get_arg(struct json_object *object, const char *name return arg; } +struct json_object *afb_msg_json_internal_error() +{ + static struct json_object *obj; + + if (obj == NULL) + obj = afb_msg_json_reply_error("failed", "internal error", NULL, NULL); + + return obj; +} +