Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
afb-stub-ws: Enforce asynchronous describe
[src/app-framework-binder.git]
/
src
/
afb-export.c
diff --git
a/src/afb-export.c
b/src/afb-export.c
index
38ef402
..
f96f8f8
100644
(file)
--- a/
src/afb-export.c
+++ b/
src/afb-export.c
@@
-1206,7
+1206,7
@@
static const struct afb_api_x3_itf hooked_api_x3_itf = {
/*
* Propagates the event to the service
*/
/*
* Propagates the event to the service
*/
-static void listener_of_events(void *closure, const char *event,
in
t eventid, struct json_object *object)
+static void listener_of_events(void *closure, const char *event,
uint16_
t eventid, struct json_object *object)
{
const struct globset_handler *handler;
void (*callback)(void *, const char*, struct json_object*, struct afb_api_x3*);
{
const struct globset_handler *handler;
void (*callback)(void *, const char*, struct json_object*, struct afb_api_x3*);
@@
-1250,7
+1250,7
@@
static void listener_of_events(void *closure, const char *event, int eventid, st
json_object_put(object);
}
json_object_put(object);
}
-static void listener_of_pushed_events(void *closure, const char *event,
in
t eventid, struct json_object *object)
+static void listener_of_pushed_events(void *closure, const char *event,
uint16_
t eventid, struct json_object *object)
{
listener_of_events(closure, event, eventid, object);
}
{
listener_of_events(closure, event, eventid, object);
}
@@
-1823,7
+1823,7
@@
static void api_call_cb(void *closure, struct afb_xreq *xreq)
}
}
}
}
-static
struct json_object *api_describe_cb(void *closure
)
+static
void api_describe_cb(void *closure, void (*describecb)(void *, struct json_object *), void *clocb
)
{
struct afb_export *export = closure;
struct json_object *result;
{
struct afb_export *export = closure;
struct json_object *result;
@@
-1846,7
+1846,7
@@
static struct json_object *api_describe_cb(void *closure)
result = NULL;
break;
}
result = NULL;
break;
}
-
return result
;
+
describecb(clocb, result)
;
}
static int api_service_start_cb(void *closure)
}
static int api_service_start_cb(void *closure)
@@
-1952,7
+1952,6
@@
void afb_export_process_xreq(struct afb_export *export, struct afb_xreq *xreq)
void afb_export_context_init(struct afb_export *export, struct afb_context *context)
{
void afb_export_context_init(struct afb_export *export, struct afb_context *context)
{
- afb_context_init(context, export->session, NULL);
- context->validated = 1;
+ afb_context_init_validated(context, export->session);
}
}