summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Bollo <jose.bollo@iot.bzh>2018-07-30 17:43:14 +0200
committerJosé Bollo <jose.bollo@iot.bzh>2018-08-02 15:49:43 +0200
commitb4455a71edcf9030c3b64c8bc13f9d50f1624aa4 (patch)
treeac52d0f4830bbe1fffb2d5eb6dbf7b89b732d3b0
parentf70e19aff15da495509e28906715d0b2e1c0798c (diff)
afb-msg-json: remove obsolete function
The function afb_msg_json_internal_error was based on the previous reply standard and was not used very much. Removing it seems a good idea. Change-Id: I3dddee9c24ffd8c43c787b9b6a737ab013d757b7 Signed-off-by: Jose Bollo <jose.bollo@iot.bzh>
-rw-r--r--src/afb-calls.c14
-rw-r--r--src/afb-msg-json.c5
-rw-r--r--src/afb-msg-json.h1
3 files changed, 9 insertions, 11 deletions
diff --git a/src/afb-calls.c b/src/afb-calls.c
index 73b89bf0..840e3eab 100644
--- a/src/afb-calls.c
+++ b/src/afb-calls.c
@@ -107,6 +107,10 @@ struct callreq
/******************************************************************************/
+static const char _internal_error_[] = "internal-error";
+
+/******************************************************************************/
+
static int store_reply(
struct json_object *iobject, const char *ierror, const char *iinfo,
struct json_object **sobject, char **serror, char **sinfo)
@@ -153,7 +157,7 @@ static void sync_enter(int signum, void *closure, struct jobloop *jobloop)
callreq->jobloop = jobloop;
afb_export_process_xreq(callreq->export, &callreq->xreq);
} else {
- afb_xreq_reply(&callreq->xreq, NULL, "internal-error", NULL);
+ afb_xreq_reply(&callreq->xreq, NULL, _internal_error_, NULL);
}
}
@@ -341,7 +345,7 @@ static int do_sync(
afb_xreq_unhooked_unref(&callreq->xreq);
interr:
- return store_reply(NULL, "internal-error", NULL, object, info, error);
+ return store_reply(NULL, _internal_error_, NULL, object, info, error);
}
/******************************************************************************/
@@ -363,7 +367,7 @@ static void do_async(
callreq = callreq_create(export, caller, api, verb, args, flags, mode);
if (!callreq)
- final(closure, NULL, "internal-error", NULL, (union callback){ .any = callback }, export, caller);
+ final(closure, NULL, _internal_error_, NULL, (union callback){ .any = callback }, export, caller);
else {
callreq->callback.any = callback;
callreq->closure = closure;
@@ -548,7 +552,7 @@ static int do_legacy_sync(
afb_xreq_unhooked_unref(&callreq->xreq);
interr:
if (object)
- *object = afb_msg_json_internal_error();
+ *object = afb_msg_json_reply(NULL, _internal_error_, NULL, NULL);
return -1;
}
@@ -572,7 +576,7 @@ static void do_legacy_async(
callreq = callreq_create(export, caller, api, verb, args, flags, mode);
if (!callreq) {
- ie = afb_msg_json_internal_error();
+ ie = afb_msg_json_reply(NULL, _internal_error_, NULL, NULL);
final(closure, -1, ie, (union callback){ .any = callback }, export, caller);
json_object_put(ie);
} else {
diff --git a/src/afb-msg-json.c b/src/afb-msg-json.c
index ceeee1a4..25a96214 100644
--- a/src/afb-msg-json.c
+++ b/src/afb-msg-json.c
@@ -75,9 +75,4 @@ struct json_object *afb_msg_json_event(const char *event, struct json_object *ob
return msg;
}
-struct json_object *afb_msg_json_internal_error()
-{
- return afb_msg_json_reply(NULL, "failed", "internal error", NULL);
-}
-
diff --git a/src/afb-msg-json.h b/src/afb-msg-json.h
index ee3ed20c..7fa14a2f 100644
--- a/src/afb-msg-json.h
+++ b/src/afb-msg-json.h
@@ -25,4 +25,3 @@ extern struct json_object *afb_msg_json_reply(struct json_object *resp, const ch
extern struct json_object *afb_msg_json_event(const char *event, struct json_object *object);
-extern struct json_object *afb_msg_json_internal_error();