diff options
| author | Havoc Pennington <hp@redhat.com> | 2005-01-17 22:03:19 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2005-01-17 22:03:19 +0000 |
| commit | ad937e16957c76f21b0df79d742cb4c401d2abb9 (patch) | |
| tree | e1d62f2663c5901ad6f340dee4a6e0973dddc1f1 /dbus/dbus-marshal-recursive-util.c | |
| parent | 62e465339a306fa564b69935da494dad6e1b474a (diff) | |
2005-01-17 Havoc Pennington <hp@redhat.com>
* Throughout, align variant bodies according to the contained
type, rather than always to 8. Should save a fair bit of space in
message headers.
* dbus/dbus-marshal-validate.c (_dbus_validate_body_with_reason):
fix handling of case where p == end
* doc/TODO: remove the dbus_bool_t item and variant alignment items
Diffstat (limited to 'dbus/dbus-marshal-recursive-util.c')
| -rw-r--r-- | dbus/dbus-marshal-recursive-util.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/dbus/dbus-marshal-recursive-util.c b/dbus/dbus-marshal-recursive-util.c index 28797099..e257a51c 100644 --- a/dbus/dbus-marshal-recursive-util.c +++ b/dbus/dbus-marshal-recursive-util.c @@ -31,20 +31,6 @@ #include <stdio.h> #include <stdlib.h> -static int -first_type_in_signature (const DBusString *str, - int pos) -{ - unsigned char t; - - t = _dbus_string_get_byte (str, pos); - - if (t == DBUS_STRUCT_BEGIN_CHAR) - return DBUS_TYPE_STRUCT; - else - return t; -} - /* Whether to do the OOM stuff (only with other expensive tests) */ #define TEST_OOM_HANDLING 0 /* We do start offset 0 through 9, to get various alignment cases. Still this @@ -2678,7 +2664,7 @@ array_write_value (TestTypeNode *node, &element_signature)) goto oom; - element_type = first_type_in_signature (&element_signature, 0); + element_type = _dbus_first_type_in_signature (&element_signature, 0); if (!_dbus_type_writer_recurse (writer, DBUS_TYPE_ARRAY, &element_signature, 0, |