Update date of copyright notices

[src/app-framework-binder.git] / src / afb-msg-json.c

diff --git a/src/afb-msg-json.c b/src/afb-msg-json.c
index 8f543ff..7597f80 100644 (file)
--- 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, 2018 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,20 +22,18 @@
 #include "afb-msg-json.h"
 #include "afb-context.h"
 
-
 struct json_object *afb_msg_json_reply(const char *status, const char *info, struct json_object *resp, struct afb_context *context, const char *reqid)
 {
        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);
@@ -73,7 +71,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();
 
@@ -82,10 +80,15 @@ 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;
 }
 
+struct json_object *afb_msg_json_internal_error()
+{
+       return afb_msg_json_reply_error("failed", "internal error", NULL, NULL);
+}
+
+