From e84c3a03b3be9cfc351ca8e0b9b935cca455e672 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 10 Apr 2003 11:04:24 +0000 Subject: 2003-04-10 Alexander Larsson * dbus/dbus-marshal.[ch]: Add array_type_pos argument to _dbus_marshal_validate_arg. Let you pass a NULL end_pos to _dbus_marshal_validate_type. * dbus/dbus-message.[ch]: Multi-dimensional arrays have full type specification in the outermost array. Iter code re-arranged to handle this. Added some more iter tests. * doc/dbus-specification.sgml: Add me to authors. Remove old FIXME. Update new array encoding description. Correct DBUS_SERVICE_FLAGS_REPLACE_EXISTING description. * test/data/invalid-messages/array-with-mixed-types.message: * test/data/valid-messages/array-of-array-of-uint32.message: Change to the new array format. * test/data/invalid-messages/too-short-dict.message: Fix bug in test. * test/data/valid-messages/recursive-types.message: Fix up and extend test. --- test/data/invalid-messages/array-with-mixed-types.message | 6 +----- test/data/invalid-messages/too-short-dict.message | 3 +++ 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'test/data/invalid-messages') diff --git a/test/data/invalid-messages/array-with-mixed-types.message b/test/data/invalid-messages/array-with-mixed-types.message index a7ff1e69..763a6c29 100644 --- a/test/data/invalid-messages/array-with-mixed-types.message +++ b/test/data/invalid-messages/array-with-mixed-types.message @@ -11,12 +11,12 @@ START_LENGTH Body TYPE ARRAY TYPE ARRAY +TYPE UINT32 LENGTH Array START_LENGTH Array ## array of uint32 -TYPE UINT32 LENGTH SubArray1 START_LENGTH SubArray1 UINT32 1 @@ -25,7 +25,6 @@ UINT32 3 END_LENGTH SubArray1 ## array of uint32 -TYPE UINT32 LENGTH SubArray2 START_LENGTH SubArray2 UINT32 4 @@ -33,13 +32,10 @@ UINT32 5 END_LENGTH SubArray2 ## array of boolean -TYPE BOOLEAN LENGTH SubArray3 START_LENGTH SubArray3 BOOLEAN false BOOLEAN true -BOOLEAN false -BOOLEAN true END_LENGTH SubArray3 END_LENGTH Array diff --git a/test/data/invalid-messages/too-short-dict.message b/test/data/invalid-messages/too-short-dict.message index 14722023..ba200461 100644 --- a/test/data/invalid-messages/too-short-dict.message +++ b/test/data/invalid-messages/too-short-dict.message @@ -8,8 +8,11 @@ END_LENGTH Header ALIGN 8 START_LENGTH Body TYPE DICT +LENGTH Dict +START_LENGTH Dict STRING 'uint32' TYPE UINT32 UINT32 0x8765432 STRING 'uint32' +END_LENGTH Dict END_LENGTH Body -- cgit