diff options
| author | Havoc Pennington <hp@redhat.com> | 2007-06-12 19:39:47 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2007-06-12 19:39:47 +0000 |
| commit | 15a610bc4c87d389463112ef0ad4fde195af83ca (patch) | |
| tree | 94e13a77a06b749498a6d74c627f0e0cc1b95976 /dbus/dbus-marshal-recursive.c | |
| parent | 1680f1fb403db648c1a9ebc45873df44dcfde6ef (diff) | |
2007-06-12 Havoc Pennington <hp@redhat.com>
* dbus/dbus-message.c (dbus_message_iter_open_container): improve
the checks/warnings for contained_signature a bit
Diffstat (limited to 'dbus/dbus-marshal-recursive.c')
| -rw-r--r-- | dbus/dbus-marshal-recursive.c | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/dbus/dbus-marshal-recursive.c b/dbus/dbus-marshal-recursive.c index b16f4ea5..3a3e8052 100644 --- a/dbus/dbus-marshal-recursive.c +++ b/dbus/dbus-marshal-recursive.c @@ -1645,9 +1645,18 @@ writer_recurse_init_and_check (DBusTypeWriter *writer, if (expected != sub->container_type) { - _dbus_warn_check_failed ("Writing an element of type %s, but the expected type here is %s\n", - _dbus_type_to_string (sub->container_type), - _dbus_type_to_string (expected)); + if (expected != DBUS_TYPE_INVALID) + _dbus_warn_check_failed ("Writing an element of type %s, but the expected type here is %s\n" + "The overall signature expected here was '%s' and we are on byte %d of that signature.\n", + _dbus_type_to_string (sub->container_type), + _dbus_type_to_string (expected), + _dbus_string_get_const_data (writer->type_str), writer->type_pos); + else + _dbus_warn_check_failed ("Writing an element of type %s, but no value is expected here\n", + "The overall signature expected here was '%s' and we are on byte %d of that signature.\n", + _dbus_type_to_string (sub->container_type), + _dbus_string_get_const_data (writer->type_str), writer->type_pos); + _dbus_assert_not_reached ("bad array element or variant content written"); } } @@ -1703,11 +1712,15 @@ write_or_verify_typecode (DBusTypeWriter *writer, if (expected != typecode) { if (expected != DBUS_TYPE_INVALID) - _dbus_warn_check_failed ("Array or variant type requires that type %s be written, but %s was written\n", - _dbus_type_to_string (expected), _dbus_type_to_string (typecode)); + _dbus_warn_check_failed ("Array or variant type requires that type %s be written, but %s was written.\n" + "The overall signature expected here was '%s' and we are on byte %d of that signature.\n", + _dbus_type_to_string (expected), _dbus_type_to_string (typecode), + _dbus_string_get_const_data (writer->type_str), writer->type_pos); else - _dbus_warn_check_failed ("Array or variant type wasn't expecting any more values to be written into it, but a value %s was written\n", - _dbus_type_to_string (typecode)); + _dbus_warn_check_failed ("Array or variant type wasn't expecting any more values to be written into it, but a value %s was written.\n" + "The overall signature expected here was '%s' and we are on byte %d of that signature.\n", + _dbus_type_to_string (typecode), + _dbus_string_get_const_data (writer->type_str), writer->type_pos); _dbus_assert_not_reached ("bad type inserted somewhere inside an array or variant"); } } |