diff options
| author | Havoc Pennington <hp@redhat.com> | 2006-11-15 01:52:01 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2006-11-15 01:52:01 +0000 |
| commit | 11c7e13107b05bd0d39a434c74859b6c5d9a2541 (patch) | |
| tree | e01ad8dad4d963fb4d2e6535f5f2f0095a7b2fbb /dbus/dbus-internals.h | |
| parent | 969ae9d7a65b12fa50acec205f0c941dcf1045a5 (diff) | |
| download | dbus-11c7e13107b05bd0d39a434c74859b6c5d9a2541.tar.gz | |
2006-11-14 Havoc Pennington <hp@redhat.com>
* dbus/dbus-internals.c (_dbus_generate_uuid): The spec said the
UUID had the timestamp last, but the implementation had it first;
move it to last since I think it's a tiny bit nicer (easier to
compare at a glance, faster to sort, less code), and will not
cause any practical compatibility problems. Also, always convert
the timestamp to big endian.
* doc/dbus-specification.xml: Clean up the docs on the UUID.
* tools/dbus-uuidgen.1: more prominently say it is not suitable
as a replacement for regular uuidgen/RFC4122.
Diffstat (limited to 'dbus/dbus-internals.h')
| -rw-r--r-- | dbus/dbus-internals.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h index 4d839241..750882b9 100644 --- a/dbus/dbus-internals.h +++ b/dbus/dbus-internals.h @@ -318,7 +318,8 @@ void _dbus_set_bad_address (DBusError *error, const char *address_problem_other); #define DBUS_UUID_LENGTH_BYTES 16 -#define DBUS_UUID_LENGTH_HEX (DBUS_UUID_LENGTH_BYTES * 2) +#define DBUS_UUID_LENGTH_WORDS (DBUS_UUID_LENGTH_BYTES / 4) +#define DBUS_UUID_LENGTH_HEX (DBUS_UUID_LENGTH_BYTES * 2) /** * A globally unique ID ; we have one for each DBusServer, and also one for each @@ -326,7 +327,7 @@ void _dbus_set_bad_address (DBusError *error, */ union DBusGUID { - dbus_uint32_t as_uint32s[DBUS_UUID_LENGTH_BYTES / 4]; /**< guid as four uint32 values */ + dbus_uint32_t as_uint32s[DBUS_UUID_LENGTH_WORDS]; /**< guid as four uint32 values */ char as_bytes[DBUS_UUID_LENGTH_BYTES]; /**< guid as 16 single-byte values */ }; |