summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-message-handler.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-04-24 19:18:23 +0000
committerHavoc Pennington <hp@redhat.com>2003-04-24 19:18:23 +0000
commitc9cd648f115759176d35508e9007dc5520a0dd3f (patch)
treef995183f7e792f5e5647274275ef6cfbbe3dffe9 /dbus/dbus-message-handler.c
parentc2a28557111c3cfdb10f8a0cfdd495ffd70fa0a3 (diff)
2003-04-24 Havoc Pennington <hp@redhat.com>
* configure.in: add --enable-checks * dbus/dbus-message.c (dbus_message_new): reverse name/service arguments * dbus/dbus-connection.c (dbus_connection_preallocate_send): fix to use thread locks. (_dbus_connection_handler_destroyed_locked): move some private functions into proper docs group * dbus/dbus-internals.h: add _dbus_return_if_fail, _dbus_return_val_if_fail Throughout: use dbus_return_if_fail
Diffstat (limited to 'dbus/dbus-message-handler.c')
-rw-r--r--dbus/dbus-message-handler.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/dbus/dbus-message-handler.c b/dbus/dbus-message-handler.c
index fb9eff07..964f7d72 100644
--- a/dbus/dbus-message-handler.c
+++ b/dbus/dbus-message-handler.c
@@ -192,6 +192,8 @@ dbus_message_handler_new (DBusHandleMessageFunction function,
void
dbus_message_handler_ref (DBusMessageHandler *handler)
{
+ _dbus_return_if_fail (handler != NULL);
+
_DBUS_LOCK (message_handler);
_dbus_assert (handler != NULL);
@@ -209,6 +211,8 @@ void
dbus_message_handler_unref (DBusMessageHandler *handler)
{
int refcount;
+
+ _dbus_return_if_fail (handler != NULL);
_DBUS_LOCK (message_handler);
@@ -254,6 +258,9 @@ void*
dbus_message_handler_get_data (DBusMessageHandler *handler)
{
void* user_data;
+
+ _dbus_return_val_if_fail (handler != NULL, NULL);
+
_DBUS_LOCK (message_handler);
user_data = handler->user_data;
_DBUS_UNLOCK (message_handler);
@@ -276,6 +283,8 @@ dbus_message_handler_set_data (DBusMessageHandler *handler,
{
DBusFreeFunction old_free_func;
void *old_user_data;
+
+ _dbus_return_if_fail (handler != NULL);
_DBUS_LOCK (message_handler);
old_free_func = handler->free_user_data;
@@ -301,6 +310,8 @@ void
dbus_message_handler_set_function (DBusMessageHandler *handler,
DBusHandleMessageFunction function)
{
+ _dbus_return_if_fail (handler != NULL);
+
_DBUS_LOCK (message_handler);
handler->function = function;
_DBUS_UNLOCK (message_handler);