fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-04-30 23:48:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove _dbus_loop_add_watch_full

Browse source 
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33342
Reviewed-by: Thiago Macieira <thiago@kde.org>
This commit is contained in:
Simon McVittie 2011-01-25 12:28:32 +00:00
parent e421626d86
commit 63b9770604
2 changed files with 3 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
dbus/dbus-mainloop.c
View file

@ -79,10 +79,7 @@ typedef struct
typedef struct
{
Callback callback;
DBusWatchFunction function;
DBusWatch *watch;
void *data;
DBusFreeFunction free_data_func;
/* last watch handle failed due to OOM */
unsigned int last_iteration_oom : 1;
} WatchCallback;
@ -99,10 +96,7 @@ typedef struct
#define TIMEOUT_CALLBACK(callback) ((TimeoutCallback*)callback)
static WatchCallback*
watch_callback_new (DBusWatch *watch,
DBusWatchFunction function,
void *data,
DBusFreeFunction free_data_func)
watch_callback_new (DBusWatch *watch)
{
WatchCallback *cb;
@ -111,12 +105,9 @@ watch_callback_new (DBusWatch *watch,
return NULL;
cb->watch = watch;
cb->function = function;
cb->last_iteration_oom = FALSE;
cb->callback.refcount = 1;
cb->callback.type = CALLBACK_WATCH;
cb->data = data;
cb->free_data_func = free_data_func;
return cb;
}
@ -158,9 +149,6 @@ callback_unref (Callback *cb)
if (cb->refcount == 0)
{
if (cb->type == CALLBACK_WATCH && WATCH_CALLBACK (cb)->free_data_func)
(WATCH_CALLBACK (cb)->free_data_func) (WATCH_CALLBACK (cb)->data);
dbus_free (cb);
}
}
@ -256,26 +244,15 @@ _dbus_loop_unref (DBusLoop *loop)
dbus_bool_t
_dbus_loop_add_watch (DBusLoop *loop,
DBusWatch *watch)
{
return _dbus_loop_add_watch_full (loop, watch, NULL, NULL, NULL);
}
dbus_bool_t
_dbus_loop_add_watch_full (DBusLoop *loop,
DBusWatch *watch,
DBusWatchFunction function,
void *data,
DBusFreeFunction free_data_func)
{
WatchCallback *wcb;
wcb = watch_callback_new (watch, function, data, free_data_func);
wcb = watch_callback_new (watch);
if (wcb == NULL)
return FALSE;
if (!add_callback (loop, (Callback*) wcb))
{
wcb->free_data_func = NULL; /* don't want to have this side effect */
callback_unref ((Callback*) wcb);
return FALSE;
}
@ -810,10 +787,7 @@ _dbus_loop_iterate (DBusLoop *loop,
{
dbus_bool_t oom;
if (wcb->function)
oom = !(* wcb->function) (wcb->watch, condition, wcb->data);
else
oom = !dbus_watch_handle (wcb->watch, condition);
oom = !dbus_watch_handle (wcb->watch, condition);
if (oom)
wcb->last_iteration_oom = TRUE;

5
dbus/dbus-mainloop.h
View file

@ -39,11 +39,6 @@ DBusLoop* _dbus_loop_ref (DBusLoop *loop);
void _dbus_loop_unref (DBusLoop *loop);
dbus_bool_t _dbus_loop_add_watch (DBusLoop *loop,
DBusWatch *watch);
dbus_bool_t _dbus_loop_add_watch_full (DBusLoop *loop,
DBusWatch *watch,
DBusWatchFunction function,
void *data,
DBusFreeFunction free_data_func);
void _dbus_loop_remove_watch (DBusLoop *loop,
DBusWatch *watch);
dbus_bool_t _dbus_loop_add_timeout (DBusLoop *loop,