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-internals.h | |
| 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-internals.h')
| -rw-r--r-- | dbus/dbus-internals.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h index 72658b65..d95e58d6 100644 --- a/dbus/dbus-internals.h +++ b/dbus/dbus-internals.h @@ -73,8 +73,6 @@ void _dbus_verbose_real (const char *format, const char* _dbus_strerror (int error_number); -DBusResultCode _dbus_result_from_errno (int error_number); - #ifdef DBUS_DISABLE_ASSERT #define _dbus_assert(condition) #else @@ -110,7 +108,8 @@ do { #define _DBUS_STRUCT_OFFSET(struct_type, member) \ ((long) ((unsigned char*) &((struct_type*) 0)->member)) -#define _DBUS_ASSERT_ERROR_IS_SET(error) _dbus_assert ((error) == NULL || dbus_error_is_set ((error))) +#define _DBUS_ASSERT_ERROR_IS_SET(error) _dbus_assert ((error) == NULL || dbus_error_is_set ((error))) +#define _DBUS_ASSERT_ERROR_IS_CLEAR(error) _dbus_assert ((error) == NULL || !dbus_error_is_set ((error))) /* This alignment thing is from ORBit2 */ /* Align a value upward to a boundary, expressed as a number of bytes. @@ -153,7 +152,7 @@ typedef void (* DBusForeachFunction) (void *element, void *data); dbus_bool_t _dbus_set_fd_nonblocking (int fd, - DBusResultCode *result); + DBusError *error); void _dbus_verbose_bytes (const unsigned char *data, int len); |