X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-msg-json.c;h=f2922cb85b5133c69ac6e2d1ef05ab0a95fcf7d9;hb=791e07d6476f6758598a68749185a807da253316;hp=59af9d96c5b0e5335ed913e547862a715bed2106;hpb=b69290c369ba67ee804bc5a0a440210c0e5d37a3;p=src%2Fapp-framework-binder.git diff --git a/src/afb-msg-json.c b/src/afb-msg-json.c index 59af9d96..f2922cb8 100644 --- a/src/afb-msg-json.c +++ b/src/afb-msg-json.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 "IoT.bzh" + * Copyright (C) 2016, 2017 "IoT.bzh" * Author: José Bollo * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -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,9 @@ 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() +{ + return afb_msg_json_reply_error("failed", "internal error", NULL, NULL); +} +