diff options
| author | Havoc Pennington <hp@redhat.com> | 2004-12-30 22:34:17 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2004-12-30 22:34:17 +0000 |
| commit | daaee020dc47f7da7e2b29f130166cfa3a4acf32 (patch) | |
| tree | 30f1561db6acdca00636385b917fda0bd872db74 /dbus/dbus-protocol-new.h | |
| parent | 7da3315f8cfc599d4b4ac2a21834550b0f10f344 (diff) | |
- remove DICT type
- add SIGNATURE type
- fix max name len of 256, should be 255 so it fits in a byte if it's going to be a number
near 256
- generalize some of the recursive type marshaling code to share between arrays and variants
- just started on implementing variant
Diffstat (limited to 'dbus/dbus-protocol-new.h')
| -rw-r--r-- | dbus/dbus-protocol-new.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/dbus/dbus-protocol-new.h b/dbus/dbus-protocol-new.h index 93cc5668..65431eb8 100644 --- a/dbus/dbus-protocol-new.h +++ b/dbus/dbus-protocol-new.h @@ -65,12 +65,12 @@ extern "C" { #define DBUS_TYPE_STRING_AS_STRING "s" #define DBUS_TYPE_OBJECT_PATH ((int) 'o') #define DBUS_TYPE_OBJECT_PATH_AS_STRING "o" +#define DBUS_TYPE_SIGNATURE ((int) 'g') +#define DBUS_TYPE_SIGNATURE_AS_STRING "g" /* Compound types */ #define DBUS_TYPE_ARRAY ((int) 'a') #define DBUS_TYPE_ARRAY_AS_STRING "a" -#define DBUS_TYPE_DICT ((int) 'm') /* not parameterized; always map<string,variant> */ -#define DBUS_TYPE_DICT_AS_STRING "m" #define DBUS_TYPE_VARIANT ((int) 'v') #define DBUS_TYPE_VARIANT_AS_STRING "v" @@ -89,8 +89,13 @@ extern "C" { #define DBUS_STRUCT_END_CHAR ((int) ')') #define DBUS_STRUCT_END_CHAR_AS_STRING ")" -/* Max length in bytes of a service or interface or member name */ -#define DBUS_MAXIMUM_NAME_LENGTH 256 +/* Max length in bytes of a service or interface or member name + * (not object path, paths are unlimited) + */ +#define DBUS_MAXIMUM_NAME_LENGTH 255 + +/* This one is 255 so it fits in a byte */ +#define DBUS_MAXIMUM_SIGNATURE_LENGTH 255 /* Max length of a match rule string */ #define DBUS_MAXIMUM_MATCH_RULE_LENGTH 1024 |