summaryrefslogtreecommitdiff
path: root/dbus/dbus-marshal.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-09-03 02:08:25 +0000
committerHavoc Pennington <hp@redhat.com>2003-09-03 02:08:25 +0000
commitd021cfae6695f0f44102edf758abfc42e2f3c093 (patch)
tree77e95134b676c65557962d50a4eab125a40e6d00 /dbus/dbus-marshal.c
parent7b4ac5de11d90e9f7048f057d70d3da5104388b6 (diff)
downloaddbus-d021cfae6695f0f44102edf758abfc42e2f3c093.tar.gz
2003-09-01 Havoc Pennington <hp@pobox.com>
* glib/dbus-gparser.c: implement * glib/dbus-gobject.c: start implementing skeletons support * configure.in: when disabling checks/assert, also define G_DISABLE_ASSERT and G_DISABLE_CHECKS
Diffstat (limited to 'dbus/dbus-marshal.c')
-rw-r--r--dbus/dbus-marshal.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/dbus/dbus-marshal.c b/dbus/dbus-marshal.c
index 5297cb67..c542ee8b 100644
--- a/dbus/dbus-marshal.c
+++ b/dbus/dbus-marshal.c
@@ -1473,7 +1473,8 @@ _dbus_demarshal_string_array (const DBusString *str,
#define VERBOSE_DECOMPOSE 0
/**
- * Demarshals an object path.
+ * Demarshals an object path. A path of just "/" is
+ * represented as an empty vector of strings.
*
* @param str the string containing the data
* @param byte_order the byte order
@@ -1556,7 +1557,6 @@ _dbus_demarshal_object_path (const DBusString *str,
i = j;
}
_dbus_assert (i == len);
- _dbus_assert (retval[0] != NULL);
*path = retval;
if (path_len)