diff options
| author | Havoc Pennington <hp@redhat.com> | 2005-01-28 05:30:53 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2005-01-28 05:30:53 +0000 |
| commit | c7816d45e82ba8dd7e1e969c2cb6c3a27577cf68 (patch) | |
| tree | dab370aee8a3a856b52daab0c898bfce06233288 /dbus/dbus-protocol.h | |
| parent | 3ed9db546e1143bc9aa2d83a6f423fdd81227352 (diff) | |
2005-01-28 Havoc Pennington <hp@redhat.com>
* doc/dbus-specification.xml: update to describe 16-bit types and
dict entries
* dbus/dbus-marshal-basic.c (_dbus_unpack_uint16): fix broken
assertion
* dbus/dbus-protocol.h (DBUS_TYPE_DICT_ENTRY): add DICT_ENTRY as a
type
* dbus/dbus-marshal-recursive.c: implement
Diffstat (limited to 'dbus/dbus-protocol.h')
| -rw-r--r-- | dbus/dbus-protocol.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/dbus/dbus-protocol.h b/dbus/dbus-protocol.h index d0a3d64e..81912622 100644 --- a/dbus/dbus-protocol.h +++ b/dbus/dbus-protocol.h @@ -77,20 +77,27 @@ extern "C" { #define DBUS_TYPE_VARIANT ((int) 'v') #define DBUS_TYPE_VARIANT_AS_STRING "v" -/* STRUCT is sort of special since its code can't appear in a type string, - * instead DBUS_STRUCT_BEGIN_CHAR has to appear +/* STRUCT and DICT_ENTRY are sort of special since their codes can't + * appear in a type string, instead + * DBUS_STRUCT_BEGIN_CHAR/DBUS_DICT_ENTRY_BEGIN_CHAR have to appear */ #define DBUS_TYPE_STRUCT ((int) 'r') #define DBUS_TYPE_STRUCT_AS_STRING "r" +#define DBUS_TYPE_DICT_ENTRY ((int) 'e') +#define DBUS_TYPE_DICT_ENTRY_AS_STRING "e" /* Does not count INVALID */ -#define DBUS_NUMBER_OF_TYPES (15) +#define DBUS_NUMBER_OF_TYPES (16) /* characters other than typecodes that appear in type signatures */ #define DBUS_STRUCT_BEGIN_CHAR ((int) '(') #define DBUS_STRUCT_BEGIN_CHAR_AS_STRING "(" #define DBUS_STRUCT_END_CHAR ((int) ')') #define DBUS_STRUCT_END_CHAR_AS_STRING ")" +#define DBUS_DICT_ENTRY_BEGIN_CHAR ((int) '{') +#define DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING "{" +#define DBUS_DICT_ENTRY_END_CHAR ((int) '}') +#define DBUS_DICT_ENTRY_END_CHAR_AS_STRING "}" /* Max length in bytes of a bus name, interface, or member (not object * path, paths are unlimited). This is limited because lots of stuff |