diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-02-01 00:08:32 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-02-01 00:08:32 +0000 |
| commit | ca84a292179f520df8e2c44a02d285ded95803ff (patch) | |
| tree | bbb4e81703260e950d5ede9e9949643a415bf1c7 /dbus/dbus-marshal.c | |
| parent | 0ff552a2c5c542a1be9a1c73597c298e6ece358f (diff) | |
2003-01-31 Havoc Pennington <hp@pobox.com>
* doc/dbus-specification.sgml: work on the specification
* dbus/dbus-message.c (_dbus_message_loader_return_buffer): check
the protocol version of the message.
* dbus/dbus-protocol.h: drop special _REPLY names, the spec
no longer specifies that.
(DBUS_SERVICE_REPLY_SERVICE_EXISTS): fix flags (1/2/4/8 not
1/2/3/4)
* dbus/dbus-marshal.c (_dbus_marshal_get_arg_end_pos): add missing
"break" for DBUS_TYPE_NIL, remove @todo
Diffstat (limited to 'dbus/dbus-marshal.c')
| -rw-r--r-- | dbus/dbus-marshal.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/dbus/dbus-marshal.c b/dbus/dbus-marshal.c index a31e0f49..2a674987 100644 --- a/dbus/dbus-marshal.c +++ b/dbus/dbus-marshal.c @@ -847,8 +847,6 @@ _dbus_demarshal_string_array (const DBusString *str, * NO VALIDATION WHATSOEVER. The message must have been previously * validated. * - * @todo handle DBUS_TYPE_NIL - * * @param str a string * @param byte_order the byte order to use * @param pos the pos where the arg starts @@ -877,6 +875,7 @@ _dbus_marshal_get_arg_end_pos (const DBusString *str, case DBUS_TYPE_NIL: *end_pos = pos + 1; + break; case DBUS_TYPE_INT32: *end_pos = _DBUS_ALIGN_VALUE (pos + 1, sizeof (dbus_int32_t)) + sizeof (dbus_int32_t); @@ -1071,8 +1070,6 @@ validate_string (const DBusString *str, * returns #TRUE if a valid arg begins at "pos" * * @todo security: need to audit this function. - * - * @todo handle DBUS_TYPE_NIL * * @param str a string * @param byte_order the byte order to use |