summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-marshal-validate.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2005-01-16 15:51:55 +0000
committerHavoc Pennington <hp@redhat.com>2005-01-16 15:51:55 +0000
commit31988af4089f3793940417535f8eabaae1ac26c8 (patch)
tree2b0d7016481a34764dd35b6391d05e2629a45f2f /dbus/dbus-marshal-validate.c
parentb3416423b1e3c17357833d896c1b7cd684660771 (diff)
2005-01-16 Havoc Pennington <hp@redhat.com>
* Add and fix docs according to Doxygen warnings throughout source. * dbus/dbus-marshal-recursive.c (_dbus_type_reader_array_is_empty): change this to just call array_reader_get_array_len() and make it static * dbus/dbus-message.c (dbus_message_iter_get_element_type): rename from get_array_type (dbus_message_iter_init_append): rename from append_iter_init * dbus/dbus-marshal-recursive.c (_dbus_type_reader_get_element_type): rename from _dbus_type_reader_get_array_type
Diffstat (limited to 'dbus/dbus-marshal-validate.c')
-rw-r--r--dbus/dbus-marshal-validate.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/dbus/dbus-marshal-validate.c b/dbus/dbus-marshal-validate.c
index cf409758..d3507739 100644
--- a/dbus/dbus-marshal-validate.c
+++ b/dbus/dbus-marshal-validate.c
@@ -203,7 +203,7 @@ validate_body_helper (DBusTypeReader *reader,
if (current_type == DBUS_TYPE_ARRAY)
{
- int array_elem_type = _dbus_type_reader_get_array_type (reader);
+ int array_elem_type = _dbus_type_reader_get_element_type (reader);
alignment = _dbus_type_get_alignment (array_elem_type);
p = _DBUS_ALIGN_ADDRESS (p, alignment);
}
@@ -419,6 +419,7 @@ validate_body_helper (DBusTypeReader *reader,
* @param expected_signature_start where in expected_signature is the signature
* @param byte_order the byte order
* @param bytes_remaining place to store leftover bytes
+ * @param value_str the string containing the body
* @param value_pos where the values start
* @param len length of values after value_pos
* @returns #DBUS_VALID if valid, reason why invalid otherwise
@@ -814,14 +815,17 @@ _dbus_validate_signature (const DBusString *str,
return _dbus_validate_signature_with_reason (str, start, len) == DBUS_VALID;
}
-/* If the compiler hates these semicolons, add "extern int
- * allow_parens" at the end in the the macro perhaps
- */
+/** define _dbus_check_is_valid_path() */
DEFINE_DBUS_NAME_CHECK(path);
+/** define _dbus_check_is_valid_interface() */
DEFINE_DBUS_NAME_CHECK(interface);
+/** define _dbus_check_is_valid_member() */
DEFINE_DBUS_NAME_CHECK(member);
+/** define _dbus_check_is_valid_error_name() */
DEFINE_DBUS_NAME_CHECK(error_name);
+/** define _dbus_check_is_valid_service() */
DEFINE_DBUS_NAME_CHECK(service);
+/** define _dbus_check_is_valid_signature() */
DEFINE_DBUS_NAME_CHECK(signature);
/** @} */