summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-07-01 20:21:35 +0000
committerHavoc Pennington <hp@redhat.com>2003-07-01 20:21:35 +0000
commit23c9bbf77f49aec7d61590d399d0423fe44dd3b3 (patch)
tree659419a8df5e96757199143b6e1aa264ab9f969d
parentfc2743e206a9b056f6f306e8e1365f8a03afa2bf (diff)
2003-07-01 Havoc Pennington <hp@redhat.com>
* doc/dbus-specification.sgml: clarify the format of a type code, change suggested by Jim Blandy
-rw-r--r--ChangeLog5
-rw-r--r--dbus/dbus-message-builder.c2
-rw-r--r--doc/dbus-specification.sgml20
3 files changed, 17 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 9846b24a..12661ed8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-01 Havoc Pennington <hp@redhat.com>
+
+ * doc/dbus-specification.sgml: clarify the format of a type code,
+ change suggested by Jim Blandy
+
2003-06-29 Miloslav Trmac <mitr@volny.cz>
* doc/Makefile.am:
diff --git a/dbus/dbus-message-builder.c b/dbus/dbus-message-builder.c
index 30b250e8..390dda75 100644
--- a/dbus/dbus-message-builder.c
+++ b/dbus/dbus-message-builder.c
@@ -1282,6 +1282,8 @@ _dbus_message_data_load (DBusString *dest,
}
retval = TRUE;
+
+ _dbus_verbose_bytes_of_string (dest, 0, _dbus_string_get_length (dest));
out:
if (length_hash != NULL)
diff --git a/doc/dbus-specification.sgml b/doc/dbus-specification.sgml
index 8b3a1d36..68a71cec 100644
--- a/doc/dbus-specification.sgml
+++ b/doc/dbus-specification.sgml
@@ -218,13 +218,12 @@
<para>
Header field names MUST consist of 4 non-nul bytes. The field name is
- NOT nul terminated; it occupies exactly 4 bytes. Following the name,
- the field MUST have a type code, and then a properly-aligned value
- of that type.
- See <xref linkend="message-protocol-arguments"> for a description
- of how each type is encoded. If an implementation sees a header
- field name that it does not understand, it MUST ignore
- that field.
+ NOT nul terminated; it occupies exactly 4 bytes. Following the name, the
+ field MUST have a type code represented as a single unsigned byte, and
+ then a properly-aligned value of that type. See <xref
+ linkend="message-protocol-arguments"> for a description of how each type
+ is encoded. If an implementation sees a header field name that it does
+ not understand, it MUST ignore that field.
</para>
<para>
@@ -288,9 +287,10 @@
<sect2 id="message-protocol-arguments">
<title>Message Arguments</title>
<para>
- The message body is made up of arguments. Each argument
- is a type code, followed by the value of the argument
- in a type-dependent format.
+ The message body is made up of arguments. Each argument is a type code,
+ represented by a single unsigned byte, followed by the aligned value of
+ the argument in a type-dependent format. Alignment padding between the
+ typecode and the value is initialized to zero.
</para>
<para>
<informaltable>