#include <json-c/json.h>
-#include <afb/afb-req-itf.h>
-
#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);
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();
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 afb_arg afb_msg_json_get_arg(struct json_object *object, const char *name)
+struct json_object *afb_msg_json_internal_error()
{
- struct afb_arg arg;
- struct json_object *value;
-
- if (json_object_object_get_ex(object, name, &value)) {
- arg.name = name;
- arg.value = json_object_get_string(value);
- } else {
- arg.name = NULL;
- arg.value = NULL;
- }
- arg.path = NULL;
- return arg;
+ return afb_msg_json_reply_error("failed", "internal error", NULL, NULL);
}