diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-08-02 01:59:14 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-08-02 01:59:14 +0000 |
| commit | fe195a911d86d0a71349988360de65cfac1b3f86 (patch) | |
| tree | d8ecdb3ff7298a83865d690640c8d78368b11833 /dbus/dbus-objectid.h | |
| parent | 8b7fe6f99dd35f32443a4e23466c8a1e4cfaa32b (diff) | |
2003-08-01 Havoc Pennington <hp@pobox.com>
* dbus/dbus-protocol.h (DBUS_MESSAGE_TYPE_*): introduce
a message type enum to distinguish kinds of message
(DBUS_HEADER_FLAG_NO_REPLY_EXPECTED): flag for a message
that need not be replied to
2003-08-01 Havoc Pennington <hp@pobox.com>
* dbus/dbus-marshal.c: adapt to DBusObjectID changes
(unpack_8_octets): fix no-64-bit-int bug
* dbus/dbus-object-registry.c (validate_id): validate the
connection ID bits, not just the instance ID.
* dbus/dbus-connection.c (_dbus_connection_init_id): initialize
the connection-global 33 bits of the object ID
* dbus/dbus-object-registry.c (info_from_entry): fill in
object ID in the new way
* dbus/dbus-objectid.h: rather than high/low bits, specifically
define server/client/instance bits.
Diffstat (limited to 'dbus/dbus-objectid.h')
| -rw-r--r-- | dbus/dbus-objectid.h | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/dbus/dbus-objectid.h b/dbus/dbus-objectid.h index ad8ea1c5..9539f9be 100644 --- a/dbus/dbus-objectid.h +++ b/dbus/dbus-objectid.h @@ -39,23 +39,31 @@ struct DBusObjectID #ifdef DBUS_HAVE_INT64 dbus_uint64_t dbus_do_not_use_dummy1; #else - dbus_uint32_t dbus_do_not_use_dummy1; dbus_uint32_t dbus_do_not_use_dummy2; + dbus_uint32_t dbus_do_not_use_dummy3; #endif }; -dbus_bool_t dbus_object_id_equal (const DBusObjectID *a, - const DBusObjectID *b); -int dbus_object_id_compare (const DBusObjectID *a, - const DBusObjectID *b); -dbus_uint32_t dbus_object_id_get_high_bits (const DBusObjectID *obj_id); -dbus_uint32_t dbus_object_id_get_low_bits (const DBusObjectID *obj_id); -void dbus_object_id_set_high_bits (DBusObjectID *obj_id, - dbus_uint32_t value); -void dbus_object_id_set_low_bits (DBusObjectID *obj_id, - dbus_uint32_t value); -void dbus_object_id_set_null (DBusObjectID *obj_id); -dbus_bool_t dbus_object_id_is_null (const DBusObjectID *obj_id); +dbus_bool_t dbus_object_id_equal (const DBusObjectID *a, + const DBusObjectID *b); +int dbus_object_id_compare (const DBusObjectID *a, + const DBusObjectID *b); +dbus_uint16_t dbus_object_id_get_server_bits (const DBusObjectID *obj_id); +dbus_uint16_t dbus_object_id_get_client_bits (const DBusObjectID *obj_id); +dbus_uint32_t dbus_object_id_get_connection_bits (const DBusObjectID *obj_id); +dbus_bool_t dbus_object_id_get_is_server_bit (const DBusObjectID *obj_id); +dbus_uint32_t dbus_object_id_get_instance_bits (const DBusObjectID *obj_id); +void dbus_object_id_set_server_bits (DBusObjectID *obj_id, + dbus_uint16_t value); +void dbus_object_id_set_client_bits (DBusObjectID *obj_id, + dbus_uint16_t value); +void dbus_object_id_set_is_server_bit (DBusObjectID *obj_id, + dbus_bool_t value); +void dbus_object_id_set_instance_bits (DBusObjectID *obj_id, + dbus_uint32_t value); +void dbus_object_id_set_null (DBusObjectID *obj_id); +dbus_bool_t dbus_object_id_is_null (const DBusObjectID *obj_id); + #ifdef DBUS_HAVE_INT64 dbus_uint64_t dbus_object_id_get_as_integer (const DBusObjectID *obj_id); void dbus_object_id_set_as_integer (DBusObjectID *obj_id, |