diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-04-24 19:18:23 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-04-24 19:18:23 +0000 |
| commit | c9cd648f115759176d35508e9007dc5520a0dd3f (patch) | |
| tree | f995183f7e792f5e5647274275ef6cfbbe3dffe9 /bus | |
| parent | c2a28557111c3cfdb10f8a0cfdd495ffd70fa0a3 (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 'bus')
| -rw-r--r-- | bus/connection.c | 6 | ||||
| -rw-r--r-- | bus/dispatch.c | 20 | ||||
| -rw-r--r-- | bus/driver.c | 17 |
3 files changed, 22 insertions, 21 deletions
diff --git a/bus/connection.c b/bus/connection.c index 14081e2e..146e3769 100644 --- a/bus/connection.c +++ b/bus/connection.c @@ -880,9 +880,9 @@ bus_connection_preallocate_oom_error (DBusConnection *connection) if (preallocated == NULL) return FALSE; - /* d->name may be NULL, but that should be OK */ - message = dbus_message_new (d->name, - DBUS_ERROR_NO_MEMORY); + /* d->name may be NULL, but that is OK */ + message = dbus_message_new (DBUS_ERROR_NO_MEMORY, + d->name); if (message == NULL) { dbus_connection_free_preallocated_send (connection, preallocated); diff --git a/bus/dispatch.c b/bus/dispatch.c index c1e67d6a..e38b3402 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -704,8 +704,8 @@ check_hello_message (BusContext *context, acquired = NULL; message = NULL; - message = dbus_message_new (DBUS_SERVICE_DBUS, - DBUS_MESSAGE_HELLO); + message = dbus_message_new (DBUS_MESSAGE_HELLO, + DBUS_SERVICE_DBUS); if (message == NULL) return TRUE; @@ -936,8 +936,8 @@ check_nonexistent_service_activation (BusContext *context, dbus_error_init (&error); - message = dbus_message_new (DBUS_SERVICE_DBUS, - DBUS_MESSAGE_ACTIVATE_SERVICE); + message = dbus_message_new (DBUS_MESSAGE_ACTIVATE_SERVICE, + DBUS_SERVICE_DBUS); if (message == NULL) return TRUE; @@ -1317,8 +1317,8 @@ check_send_exit_to_service (BusContext *context, retval = FALSE; /* Kill off the test service by sending it a quit message */ - message = dbus_message_new (service_name, - "org.freedesktop.DBus.TestSuiteExit"); + message = dbus_message_new ("org.freedesktop.DBus.TestSuiteExit", + service_name); if (message == NULL) { @@ -1490,8 +1490,8 @@ check_existent_service_activation (BusContext *context, dbus_error_init (&error); - message = dbus_message_new (DBUS_SERVICE_DBUS, - DBUS_MESSAGE_ACTIVATE_SERVICE); + message = dbus_message_new (DBUS_MESSAGE_ACTIVATE_SERVICE, + DBUS_SERVICE_DBUS); if (message == NULL) return TRUE; @@ -1698,8 +1698,8 @@ check_segfault_service_activation (BusContext *context, dbus_error_init (&error); - message = dbus_message_new (DBUS_SERVICE_DBUS, - DBUS_MESSAGE_ACTIVATE_SERVICE); + message = dbus_message_new (DBUS_MESSAGE_ACTIVATE_SERVICE, + DBUS_SERVICE_DBUS); if (message == NULL) return TRUE; diff --git a/bus/driver.c b/bus/driver.c index bc58f556..299968f4 100644 --- a/bus/driver.c +++ b/bus/driver.c @@ -49,8 +49,8 @@ bus_driver_send_service_deleted (const char *service_name, _dbus_verbose ("sending service deleted: %s\n", service_name); - message = dbus_message_new (DBUS_SERVICE_BROADCAST, - DBUS_MESSAGE_SERVICE_DELETED); + message = dbus_message_new (DBUS_MESSAGE_SERVICE_DELETED, + DBUS_SERVICE_BROADCAST); if (message == NULL) { BUS_SET_OOM (error); @@ -83,8 +83,8 @@ bus_driver_send_service_created (const char *service_name, _DBUS_ASSERT_ERROR_IS_CLEAR (error); - message = dbus_message_new (DBUS_SERVICE_BROADCAST, - DBUS_MESSAGE_SERVICE_CREATED); + message = dbus_message_new (DBUS_MESSAGE_SERVICE_CREATED, + DBUS_SERVICE_BROADCAST); if (message == NULL) { BUS_SET_OOM (error); @@ -123,8 +123,8 @@ bus_driver_send_service_lost (DBusConnection *connection, _DBUS_ASSERT_ERROR_IS_CLEAR (error); - message = dbus_message_new (bus_connection_get_name (connection), - DBUS_MESSAGE_SERVICE_LOST); + message = dbus_message_new (DBUS_MESSAGE_SERVICE_LOST, + bus_connection_get_name (connection)); if (message == NULL) { BUS_SET_OOM (error); @@ -163,8 +163,9 @@ bus_driver_send_service_acquired (DBusConnection *connection, _DBUS_ASSERT_ERROR_IS_CLEAR (error); - message = dbus_message_new (bus_connection_get_name (connection), - DBUS_MESSAGE_SERVICE_ACQUIRED); + message = dbus_message_new (DBUS_MESSAGE_SERVICE_ACQUIRED, + bus_connection_get_name (connection)); + if (message == NULL) { BUS_SET_OOM (error); |