From 56cc4ae1a241d36b64dbe26de89714f7771f6e78 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sun, 12 Oct 2003 00:55:11 +0000 Subject: 2003-10-11 Havoc Pennington * test/decode-gcov.c (function_solve_graph): make broken block graph a nonfatal error since it seems to be broken. Need to debug this. * dbus/dbus-marshal.c (_dbus_type_is_valid): new function since we can't just check type > INVALID < LAST anymore * dbus/dbus-message.c (dbus_message_get_signature): new function (dbus_message_has_signature): new function (struct DBusMessage): add signature field (right now it isn't sent over the wire, just generated on the fly) (dbus_message_copy): copy the signature, and init strings to proper length to avoid some reallocs (dbus_message_iter_init_array_iterator): return void, since it can't fail (dbus_message_iter_init_dict_iterator): return void since it can't fail (_dbus_message_loader_queue_messages): add silly temporary hack to fill in message->signature on load * dbus/dbus-protocol.h: change DBUS_TYPE_* values to be ASCII characters, so they are relatively human-readable. --- dbus/dbus-protocol.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'dbus/dbus-protocol.h') diff --git a/dbus/dbus-protocol.h b/dbus/dbus-protocol.h index 549ef0e5..94bb4dd9 100644 --- a/dbus/dbus-protocol.h +++ b/dbus/dbus-protocol.h @@ -40,22 +40,22 @@ extern "C" { #define DBUS_MAJOR_PROTOCOL_VERSION 0 /* Data types */ -#define DBUS_TYPE_INVALID 0 -#define DBUS_TYPE_NIL 1 -#define DBUS_TYPE_BYTE 2 -#define DBUS_TYPE_BOOLEAN 3 -#define DBUS_TYPE_INT32 4 -#define DBUS_TYPE_UINT32 5 -#define DBUS_TYPE_INT64 6 -#define DBUS_TYPE_UINT64 7 -#define DBUS_TYPE_DOUBLE 8 -#define DBUS_TYPE_STRING 9 -#define DBUS_TYPE_NAMED 10 -#define DBUS_TYPE_ARRAY 11 -#define DBUS_TYPE_DICT 12 -#define DBUS_TYPE_OBJECT_PATH 13 - -#define DBUS_TYPE_LAST DBUS_TYPE_OBJECT_PATH +#define DBUS_TYPE_INVALID ((int) '\0') +#define DBUS_TYPE_NIL ((int) 'v') +#define DBUS_TYPE_BYTE ((int) 'y') +#define DBUS_TYPE_BOOLEAN ((int) 'b') +#define DBUS_TYPE_INT32 ((int) 'i') +#define DBUS_TYPE_UINT32 ((int) 'u') +#define DBUS_TYPE_INT64 ((int) 'x') +#define DBUS_TYPE_UINT64 ((int) 't') +#define DBUS_TYPE_DOUBLE ((int) 'd') +#define DBUS_TYPE_STRING ((int) 's') +#define DBUS_TYPE_NAMED ((int) 'n') +#define DBUS_TYPE_ARRAY ((int) 'a') +#define DBUS_TYPE_DICT ((int) 'c') +#define DBUS_TYPE_OBJECT_PATH ((int) 'o') + +#define DBUS_NUMBER_OF_TYPES (13) /* Max length in bytes of a service or interface or member name */ #define DBUS_MAXIMUM_NAME_LENGTH 256 -- cgit