diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-03-25 04:37:08 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-03-25 04:37:08 +0000 |
| commit | ce4fd314c6be9bfee16a172d5ca34e5097d309fc (patch) | |
| tree | 744b8524f183a0fbb009d917029c9a129b34da9e /dbus/dbus-message.c | |
| parent | 44fff656885ac32e319feb98fd0d06680d602977 (diff) | |
2003-03-24 Havoc Pennington <hp@redhat.com>
* dbus/dbus-sysdeps.c (_dbus_set_fd_nonblocking): move to this
file
* dbus/dbus-errors.c (dbus_set_error, dbus_set_error_const): allow
NULL argument for "message" if the error is a well-known one,
fill in a generic message in this case.
* dbus/dbus-errors.h (DBusResultCode): Kill DBusResultCode in
favor of DBusError
* bus/test.c (bus_test_flush_bus): add
* bus/policy.c (bus_policy_test): test code stub
Diffstat (limited to 'dbus/dbus-message.c')
| -rw-r--r-- | dbus/dbus-message.c | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c index 6366c54e..524a7a3f 100644 --- a/dbus/dbus-message.c +++ b/dbus/dbus-message.c @@ -1555,9 +1555,11 @@ dbus_message_get_args (DBusMessage *message, int first_arg_type, ...) { - DBusResultCode retval; + dbus_bool_t retval; va_list var_args; + _DBUS_ASSERT_ERROR_IS_CLEAR (error); + va_start (var_args, first_arg_type); retval = dbus_message_get_args_valist (message, error, first_arg_type, var_args); va_end (var_args); @@ -1593,13 +1595,14 @@ dbus_message_get_args_valist (DBusMessage *message, int spec_type, msg_type, i; DBusMessageIter *iter; dbus_bool_t retval; + + _DBUS_ASSERT_ERROR_IS_CLEAR (error); iter = dbus_message_get_args_iter (message); if (iter == NULL) { - dbus_set_error (error, DBUS_ERROR_NO_MEMORY, - "No memory to get message arguments"); + dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); return FALSE; } @@ -1675,8 +1678,7 @@ dbus_message_get_args_valist (DBusMessage *message, if (!*ptr) { - dbus_set_error (error, DBUS_ERROR_NO_MEMORY, - "No memory for argument %d", i); + dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); goto out; } @@ -1693,8 +1695,7 @@ dbus_message_get_args_valist (DBusMessage *message, if (!dbus_message_iter_get_boolean_array (iter, ptr, len)) { - dbus_set_error (error, DBUS_ERROR_NO_MEMORY, - "No memory for argument %d", i); + dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); goto out; } break; @@ -1710,8 +1711,7 @@ dbus_message_get_args_valist (DBusMessage *message, if (!dbus_message_iter_get_int32_array (iter, ptr, len)) { - dbus_set_error (error, DBUS_ERROR_NO_MEMORY, - "No memory for argument %d", i); + dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); goto out; } @@ -1728,8 +1728,7 @@ dbus_message_get_args_valist (DBusMessage *message, if (!dbus_message_iter_get_uint32_array (iter, ptr, len)) { - dbus_set_error (error, DBUS_ERROR_NO_MEMORY, - "No memory for argument %d", i); + dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); goto out; } @@ -1746,8 +1745,7 @@ dbus_message_get_args_valist (DBusMessage *message, if (!dbus_message_iter_get_double_array (iter, ptr, len)) { - dbus_set_error (error, DBUS_ERROR_NO_MEMORY, - "No memory for argument %d", i); + dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); goto out; } break; @@ -1763,8 +1761,7 @@ dbus_message_get_args_valist (DBusMessage *message, if (!dbus_message_iter_get_byte_array (iter, ptr, len)) { - dbus_set_error (error, DBUS_ERROR_NO_MEMORY, - "No memory for argument %d", i); + dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); goto out; } break; @@ -1779,8 +1776,7 @@ dbus_message_get_args_valist (DBusMessage *message, if (!dbus_message_iter_get_string_array (iter, ptr, len)) { - dbus_set_error (error, DBUS_ERROR_NO_MEMORY, - "No memory for argument %d", i); + dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); goto out; } break; @@ -1793,8 +1789,7 @@ dbus_message_get_args_valist (DBusMessage *message, if (!dbus_message_iter_get_dict (iter, dict)) { - dbus_set_error (error, DBUS_ERROR_NO_MEMORY, - "No memory for argument %d", i); + dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); goto out; } break; |