summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-marshal.h
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-07-07 00:47:01 +0000
committerHavoc Pennington <hp@redhat.com>2003-07-07 00:47:01 +0000
commit3f1ad214b5e5c63697ee208d459b304a4ef6e79b (patch)
tree9912979a2b6989b66c6812f21c24cdde698d032c /dbus/dbus-marshal.h
parent320aac6ce610bfdeedebc39d26a6d27e957275f9 (diff)
2003-07-06 Havoc Pennington <hp@pobox.com>
* dbus/dbus-marshal.c (_dbus_marshal_set_object_id): new function (_dbus_marshal_object_id): new (_dbus_demarshal_object_id): new (_dbus_marshal_get_arg_end_pos): support object ID type, and consolidate identical switch cases. Don't conditionalize handling of DBUS_TYPE_UINT64, need to handle the type always. (_dbus_marshal_validate_arg): consolidate identical cases, and handle DBUS_TYPE_OBJECT_ID * dbus/dbus-objectid.c: new file with DBusObjectID data type. * dbus/dbus-protocol.h: add DBUS_TYPE_OBJECT_ID
Diffstat (limited to 'dbus/dbus-marshal.h')
-rw-r--r--dbus/dbus-marshal.h28
1 files changed, 20 insertions, 8 deletions
diff --git a/dbus/dbus-marshal.h b/dbus/dbus-marshal.h
index 1eff8995..af18876a 100644
--- a/dbus/dbus-marshal.h
+++ b/dbus/dbus-marshal.h
@@ -29,6 +29,7 @@
#include <dbus/dbus-types.h>
#include <dbus/dbus-arch-deps.h>
#include <dbus/dbus-string.h>
+#include <dbus/dbus-objectid.h>
#ifndef PACKAGE
#error "config.h not included here"
@@ -152,11 +153,16 @@ void _dbus_marshal_set_uint64 (DBusString *str,
int offset,
dbus_uint64_t value);
#endif /* DBUS_HAVE_INT64 */
-dbus_bool_t _dbus_marshal_set_string (DBusString *str,
- int byte_order,
- int offset,
- const DBusString *value,
- int len);
+
+dbus_bool_t _dbus_marshal_set_string (DBusString *str,
+ int byte_order,
+ int offset,
+ const DBusString *value,
+ int len);
+void _dbus_marshal_set_object_id (DBusString *str,
+ int byte_order,
+ int offset,
+ const DBusObjectID *value);
dbus_bool_t _dbus_marshal_int32 (DBusString *str,
int byte_order,
@@ -208,6 +214,10 @@ dbus_bool_t _dbus_marshal_string_array (DBusString *str,
int byte_order,
const char **value,
int len);
+dbus_bool_t _dbus_marshal_object_id (DBusString *str,
+ int byte_order,
+ const DBusObjectID *value);
+
double _dbus_demarshal_double (const DBusString *str,
int byte_order,
int pos,
@@ -278,9 +288,11 @@ dbus_bool_t _dbus_demarshal_string_array (const DBusString *str,
int *new_pos,
char ***array,
int *array_len);
-
-
-
+void _dbus_demarshal_object_id (const DBusString *str,
+ int byte_order,
+ int pos,
+ int *new_pos,
+ DBusObjectID *value);
dbus_bool_t _dbus_marshal_get_arg_end_pos (const DBusString *str,
int byte_order,