summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-message.h
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@codefactory.se>2003-01-14 11:19:06 +0000
committerAnders Carlsson <andersca@codefactory.se>2003-01-14 11:19:06 +0000
commit1b9a4589f6836641ded324b7b5d003c5cbfb0b78 (patch)
treef2e1993b8d95b447e1a0f203065044a18c12a984 /dbus/dbus-message.h
parenta22c4589d8cc14d94537694476dc96c33c2bfcb4 (diff)
2003-01-14 Anders Carlsson <andersca@codefactory.se>
* bus/connection.c: (connection_error_handler), (bus_connection_setup): * bus/main.c: (main): Make sure that the DBusConnectionData struct is NULLed out to prevent a segfault. * dbus/dbus-errors.c: (dbus_result_to_string): * dbus/dbus-errors.h: * dbus/dbus-message.c: (dbus_message_get_fields), (dbus_message_get_fields_valist), (_dbus_message_test): * dbus/dbus-message.h: Make dbus_message_get_fields return a result code so we can track invalid fields as well as oom.
Diffstat (limited to 'dbus/dbus-message.h')
-rw-r--r--dbus/dbus-message.h37
1 files changed, 19 insertions, 18 deletions
diff --git a/dbus/dbus-message.h b/dbus/dbus-message.h
index f1b49f9b..5da95796 100644
--- a/dbus/dbus-message.h
+++ b/dbus/dbus-message.h
@@ -65,25 +65,26 @@ dbus_bool_t dbus_message_append_byte_array (DBusMessage *message,
DBusMessageIter *dbus_message_get_fields_iter (DBusMessage *message);
+DBusResultCode dbus_message_get_fields (DBusMessage *message,
+ int first_field_type,
+ ...);
+DBusResultCode dbus_message_get_fields_valist (DBusMessage *message,
+ int first_field_type,
+ va_list var_args);
+
+void dbus_message_iter_ref (DBusMessageIter *iter);
+void dbus_message_iter_unref (DBusMessageIter *iter);
+
+dbus_bool_t dbus_message_iter_has_next (DBusMessageIter *iter);
+dbus_bool_t dbus_message_iter_next (DBusMessageIter *iter);
+int dbus_message_iter_get_field_type (DBusMessageIter *iter);
+int dbus_message_iter_get_int32 (DBusMessageIter *iter);
+int dbus_message_iter_get_uint32 (DBusMessageIter *iter);
+double dbus_message_iter_get_double (DBusMessageIter *iter);
+char * dbus_message_iter_get_string (DBusMessageIter *iter);
+unsigned char * dbus_message_iter_get_byte_array (DBusMessageIter *iter,
+ int *len);
-dbus_bool_t dbus_message_get_fields (DBusMessage *message,
- int first_field_type,
- ...);
-dbus_bool_t dbus_message_get_fields_valist (DBusMessage *message,
- int first_field_type,
- va_list var_args);
-
-void dbus_message_iter_ref (DBusMessageIter *iter);
-void dbus_message_iter_unref (DBusMessageIter *iter);
-
-dbus_bool_t dbus_message_iter_has_next (DBusMessageIter *iter);
-dbus_bool_t dbus_message_iter_next (DBusMessageIter *iter);
-int dbus_message_iter_get_field_type (DBusMessageIter *iter);
-int dbus_message_iter_get_int32 (DBusMessageIter *iter);
-int dbus_message_iter_get_uint32 (DBusMessageIter *iter);
-double dbus_message_iter_get_double (DBusMessageIter *iter);
-char * dbus_message_iter_get_string (DBusMessageIter *iter);
-unsigned char *dbus_message_iter_get_byte_array (DBusMessageIter *iter, int *len);