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
Deprecate internal use of afb_event
[src/app-framework-binder.git]
/
src
/
afb-stub-ws.c
diff --git
a/src/afb-stub-ws.c
b/src/afb-stub-ws.c
index
e7c8997
..
625cea3
100644
(file)
--- a/
src/afb-stub-ws.c
+++ b/
src/afb-stub-ws.c
@@
-102,8
+102,8
@@
struct server_req {
struct client_event
{
struct client_event *next;
struct client_event
{
struct client_event *next;
- struct afb_event
event
;
- int
event
id;
+ struct afb_event
id *eventid
;
+ int id;
int refcount;
};
int refcount;
};
@@
-204,7
+204,7
@@
static void server_req_subcall_cb(struct afb_xreq *xreq, const char *api, const
ERROR("error while sending subcall");
}
ERROR("error while sending subcall");
}
-static int server_req_subscribe_cb(struct afb_xreq *xreq, struct afb_event
event)
+static int server_req_subscribe_cb(struct afb_xreq *xreq, struct afb_event
id *
event)
{
int rc;
struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
{
int rc;
struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
@@
-217,7
+217,7
@@
static int server_req_subscribe_cb(struct afb_xreq *xreq, struct afb_event event
return rc;
}
return rc;
}
-static int server_req_unsubscribe_cb(struct afb_xreq *xreq, struct afb_event
event)
+static int server_req_unsubscribe_cb(struct afb_xreq *xreq, struct afb_event
id *
event)
{
int rc, rc2;
struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
{
int rc, rc2;
struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
@@
-248,7
+248,7
@@
static struct client_event *client_event_search(struct afb_stub_ws *stubws, uint
struct client_event *ev;
ev = stubws->events;
struct client_event *ev;
ev = stubws->events;
- while (ev != NULL && (ev->
eventid != eventid || 0 != strcmp(afb_evt_event_fullname(ev->event
), name)))
+ while (ev != NULL && (ev->
id != eventid || 0 != strcmp(afb_evt_event_fullname(ev->eventid
), name)))
ev = ev->next;
return ev;
ev = ev->next;
return ev;
@@
-360,10
+360,10
@@
static void on_event_create(void *closure, const char *event_name, int event_id)
/* no conflict, try to add it */
ev = malloc(sizeof *ev);
if (ev != NULL) {
/* no conflict, try to add it */
ev = malloc(sizeof *ev);
if (ev != NULL) {
- ev->event = afb_evt_create_event(event_name);
- if (ev->event
.closure
!= NULL) {
+ ev->event
id
= afb_evt_create_event(event_name);
+ if (ev->event
id
!= NULL) {
ev->refcount = 1;
ev->refcount = 1;
- ev->
event
id = event_id;
+ ev->id = event_id;
ev->next = stubws->events;
stubws->events = ev;
return;
ev->next = stubws->events;
stubws->events = ev;
return;
@@
-394,7
+394,7
@@
static void on_event_remove(void *closure, const char *event_name, int event_id)
*prv = ev->next;
/* destroys the event */
*prv = ev->next;
/* destroys the event */
- afb_ev
ent_unref(ev->event
);
+ afb_ev
t_event_unref(ev->eventid
);
free(ev);
}
free(ev);
}
@@
-409,7
+409,7
@@
static void on_event_subscribe(void *closure, void *request, const char *event_n
if (ev == NULL)
return;
if (ev == NULL)
return;
- if (afb_xreq_subscribe(xreq, ev->event) < 0)
+ if (afb_xreq_subscribe(xreq, ev->event
id
) < 0)
ERROR("can't subscribe: %m");
}
ERROR("can't subscribe: %m");
}
@@
-424,7
+424,7
@@
static void on_event_unsubscribe(void *closure, void *request, const char *event
if (ev == NULL)
return;
if (ev == NULL)
return;
- if (afb_xreq_unsubscribe(xreq, ev->event) < 0)
+ if (afb_xreq_unsubscribe(xreq, ev->event
id
) < 0)
ERROR("can't unsubscribe: %m");
}
ERROR("can't unsubscribe: %m");
}
@@
-436,7
+436,7
@@
static void on_event_push(void *closure, const char *event_name, int event_id, s
/* check conflicts */
ev = client_event_search(stubws, event_id, event_name);
if (ev)
/* check conflicts */
ev = client_event_search(stubws, event_id, event_name);
if (ev)
- afb_ev
ent_push(ev->event
, data);
+ afb_ev
t_push(ev->eventid
, data);
else
ERROR("unreadable push event");
}
else
ERROR("unreadable push event");
}
@@
-585,7
+585,7
@@
static void drop_all_events(struct afb_stub_ws *stubws)
while (ev) {
nxt = ev->next;
while (ev) {
nxt = ev->next;
- afb_ev
ent_unref(ev->event
);
+ afb_ev
t_event_unref(ev->eventid
);
free(ev);
ev = nxt;
}
free(ev);
ev = nxt;
}