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
packaging: Update spec and deb packaging
[src/app-framework-binder.git]
/
src
/
afb-evt.c
diff --git
a/src/afb-evt.c
b/src/afb-evt.c
index
e3a3420
..
9937c1a
100644
(file)
--- a/
src/afb-evt.c
+++ b/
src/afb-evt.c
@@
-634,12
+634,12
@@
void afb_evt_update_hooks()
pthread_mutex_unlock(&events_mutex);
}
pthread_mutex_unlock(&events_mutex);
}
-inline struct afb_evtid *afb_evt_to_evtid(struct afb_eventid *eventid)
+inline struct afb_evtid *afb_evt_
eventid_
to_evtid(struct afb_eventid *eventid)
{
return (struct afb_evtid*)eventid;
}
{
return (struct afb_evtid*)eventid;
}
-inline struct afb_eventid *afb_evt_from_evtid(struct afb_evtid *evtid)
+inline struct afb_eventid *afb_evt_
eventid_
from_evtid(struct afb_evtid *evtid)
{
return &evtid->eventid;
}
{
return &evtid->eventid;
}
@@
-648,26
+648,26
@@
inline struct afb_eventid *afb_evt_from_evtid(struct afb_evtid *evtid)
* Creates an event of 'fullname' and returns it.
* Returns an event with closure==NULL in case of error.
*/
* Creates an event of 'fullname' and returns it.
* Returns an event with closure==NULL in case of error.
*/
-struct afb_eventid *afb_evt_
create_event
(const char *fullname)
+struct afb_eventid *afb_evt_
eventid_create
(const char *fullname)
{
{
- return afb_evt_from_evtid(afb_evt_evtid_create(fullname));
+ return afb_evt_
eventid_
from_evtid(afb_evt_evtid_create(fullname));
}
/*
* Returns the fullname of the 'eventid'
*/
}
/*
* Returns the fullname of the 'eventid'
*/
-const char *afb_evt_event_fullname(struct afb_eventid *eventid)
+const char *afb_evt_event
id
_fullname(struct afb_eventid *eventid)
{
{
- struct afb_evtid *evtid = afb_evt_to_evtid(eventid);
+ struct afb_evtid *evtid = afb_evt_
eventid_
to_evtid(eventid);
return evtid ? evtid->fullname : NULL;
}
/*
* Returns the id of the 'eventid'
*/
return evtid ? evtid->fullname : NULL;
}
/*
* Returns the id of the 'eventid'
*/
-int afb_evt_event_id(struct afb_eventid *eventid)
+int afb_evt_event
id
_id(struct afb_eventid *eventid)
{
{
- struct afb_evtid *evtid = afb_evt_to_evtid(eventid);
+ struct afb_evtid *evtid = afb_evt_
eventid_
to_evtid(eventid);
return evtid ? evtid->id : 0;
}
return evtid ? evtid->id : 0;
}
@@
-675,9
+675,9
@@
int afb_evt_event_id(struct afb_eventid *eventid)
* Makes the 'listener' watching 'eventid'
* Returns 0 in case of success or else -1.
*/
* Makes the 'listener' watching 'eventid'
* Returns 0 in case of success or else -1.
*/
-int afb_evt_add_watch(struct afb_evt_listener *listener, struct afb_eventid *eventid)
+int afb_evt_
eventid_
add_watch(struct afb_evt_listener *listener, struct afb_eventid *eventid)
{
{
- struct afb_evtid *evtid = afb_evt_to_evtid(eventid);
+ struct afb_evtid *evtid = afb_evt_
eventid_
to_evtid(eventid);
/* check parameter */
if (!evtid) {
/* check parameter */
if (!evtid) {
@@
-693,9
+693,9
@@
int afb_evt_add_watch(struct afb_evt_listener *listener, struct afb_eventid *eve
* Avoids the 'listener' to watch 'eventid'
* Returns 0 in case of success or else -1.
*/
* Avoids the 'listener' to watch 'eventid'
* Returns 0 in case of success or else -1.
*/
-int afb_evt_remove_watch(struct afb_evt_listener *listener, struct afb_eventid *eventid)
+int afb_evt_
eventid_
remove_watch(struct afb_evt_listener *listener, struct afb_eventid *eventid)
{
{
- struct afb_evtid *evtid = afb_evt_to_evtid(eventid);
+ struct afb_evtid *evtid = afb_evt_
eventid_
to_evtid(eventid);
/* check parameter */
if (!evtid) {
/* check parameter */
if (!evtid) {
@@
-707,34
+707,43
@@
int afb_evt_remove_watch(struct afb_evt_listener *listener, struct afb_eventid *
return afb_evt_watch_sub_evtid(listener, evtid);
}
return afb_evt_watch_sub_evtid(listener, evtid);
}
-int afb_evt_push(struct afb_eventid *eventid, struct json_object *object)
+int afb_evt_
eventid_
push(struct afb_eventid *eventid, struct json_object *object)
{
{
- struct afb_evtid *evtid = afb_evt_to_evtid(eventid);
+ struct afb_evtid *evtid = afb_evt_
eventid_
to_evtid(eventid);
if (evtid)
return afb_evt_evtid_hooked_push(evtid, object);
json_object_put(object);
return 0;
}
if (evtid)
return afb_evt_evtid_hooked_push(evtid, object);
json_object_put(object);
return 0;
}
-int afb_evt_unhooked_push(struct afb_eventid *eventid, struct json_object *object)
+int afb_evt_
eventid_
unhooked_push(struct afb_eventid *eventid, struct json_object *object)
{
{
- struct afb_evtid *evtid = afb_evt_to_evtid(eventid);
+ struct afb_evtid *evtid = afb_evt_
eventid_
to_evtid(eventid);
if (evtid)
return afb_evt_evtid_push(evtid, object);
json_object_put(object);
return 0;
}
if (evtid)
return afb_evt_evtid_push(evtid, object);
json_object_put(object);
return 0;
}
-struct afb_event afb_event_from_evtid(struct afb_evtid *evtid)
+struct afb_event afb_ev
t_ev
ent_from_evtid(struct afb_evtid *evtid)
{
return evtid
? (struct afb_event){ .itf = &afb_evt_hooked_eventid_itf, .closure = &evtid->eventid }
: (struct afb_event){ .itf = NULL, .closure = NULL };
}
{
return evtid
? (struct afb_event){ .itf = &afb_evt_hooked_eventid_itf, .closure = &evtid->eventid }
: (struct afb_event){ .itf = NULL, .closure = NULL };
}
-void afb_evt_event_unref(struct afb_eventid *eventid)
+void afb_evt_event
id
_unref(struct afb_eventid *eventid)
{
{
- struct afb_evtid *evtid = afb_evt_to_evtid(eventid);
+ struct afb_evtid *evtid = afb_evt_
eventid_
to_evtid(eventid);
if (evtid)
afb_evt_evtid_unref(evtid);
}
if (evtid)
afb_evt_evtid_unref(evtid);
}
+
+struct afb_eventid *afb_evt_eventid_addref(struct afb_eventid *eventid)
+{
+ struct afb_evtid *evtid = afb_evt_eventid_to_evtid(eventid);
+ if (evtid)
+ afb_evt_evtid_addref(evtid);
+ return eventid;
+}
+