Update copyright dates

[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..6cb9039 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) 2015-2020 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,58 +22,34 @@
 #include "afb-msg-json.h"
 #include "afb-context.h"
 
+static const char _success_[] = "success";
 
-struct json_object *afb_msg_json_reply(const char *status, const char *info, struct json_object *resp, struct afb_context *context, const char *reqid)
+struct json_object *afb_msg_json_reply(struct json_object *resp, const char *error, const char *info, struct afb_context *context)
 {
        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);
-       json_object_object_add(request, "status", json_object_new_string(status));
+       json_object_object_add(request, "status", json_object_new_string(error ?: _success_));
 
        if (info != NULL)
                json_object_object_add(request, "info", json_object_new_string(info));
 
-       if (reqid != NULL)
-               json_object_object_add(request, "reqid", json_object_new_string(reqid));
-
-       if (context != NULL) {
-               token = afb_context_sent_token(context);
-               if (token != NULL)
-                       json_object_object_add(request, "token", json_object_new_string(token));
-
-               uuid = afb_context_sent_uuid(context);
-               if (uuid != NULL)
-                       json_object_object_add(request, "uuid", json_object_new_string(uuid));
-       }
-
        return msg;
 }
 
-struct json_object *afb_msg_json_reply_ok(const char *info, struct json_object *resp, struct afb_context *context, const char *reqid)
-{
-       return afb_msg_json_reply("success", info, resp, context, reqid);
-}
-
-struct json_object *afb_msg_json_reply_error(const char *status, const char *info, struct afb_context *context, const char *reqid)
-{
-       return afb_msg_json_reply(status, info, NULL, context, reqid);
-}
-
 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 +58,10 @@ 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;
 }
 
+