From c7816d45e82ba8dd7e1e969c2cb6c3a27577cf68 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 28 Jan 2005 05:30:53 +0000 Subject: 2005-01-28 Havoc Pennington * 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 --- dbus/dbus-marshal-validate.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'dbus/dbus-marshal-validate.h') diff --git a/dbus/dbus-marshal-validate.h b/dbus/dbus-marshal-validate.h index 94b77989..55739d31 100644 --- a/dbus/dbus-marshal-validate.h +++ b/dbus/dbus-marshal-validate.h @@ -100,7 +100,14 @@ typedef enum DBUS_INVALID_VARIANT_SIGNATURE_SPECIFIES_MULTIPLE_VALUES = 46, DBUS_INVALID_VARIANT_SIGNATURE_MISSING_NUL = 47, DBUS_INVALID_STRING_MISSING_NUL = 48, - DBUS_INVALID_SIGNATURE_MISSING_NUL = 49 + DBUS_INVALID_SIGNATURE_MISSING_NUL = 49, + DBUS_INVALID_EXCEEDED_MAXIMUM_DICT_ENTRY_RECURSION = 50, + DBUS_INVALID_DICT_ENTRY_ENDED_BUT_NOT_STARTED = 51, + DBUS_INVALID_DICT_ENTRY_STARTED_BUT_NOT_ENDED = 52, + DBUS_INVALID_DICT_ENTRY_HAS_NO_FIELDS = 53, + DBUS_INVALID_DICT_ENTRY_HAS_ONLY_ONE_FIELD = 54, + DBUS_INVALID_DICT_ENTRY_HAS_TOO_MANY_FIELDS = 55, + DBUS_INVALID_DICT_ENTRY_NOT_INSIDE_ARRAY = 56 } DBusValidity; DBusValidity _dbus_validate_signature_with_reason (const DBusString *type_str, -- cgit