From 9d21554dd3b560952cd5aa607c4ec07898c0b260 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sun, 23 Jan 2005 06:10:07 +0000 Subject: 2005-01-23 Havoc Pennington * dbus/dbus-message-factory.c, dbus/dbus-message-util.c: get this all working, not many tests in the framework yet though --- dbus/dbus-test.h | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'dbus/dbus-test.h') diff --git a/dbus/dbus-test.h b/dbus/dbus-test.h index b9865f09..06d368fa 100644 --- a/dbus/dbus-test.h +++ b/dbus/dbus-test.h @@ -26,14 +26,7 @@ #include #include - -typedef enum -{ - _DBUS_MESSAGE_VALID, - _DBUS_MESSAGE_INVALID, - _DBUS_MESSAGE_INCOMPLETE, - _DBUS_MESSAGE_UNKNOWN -} DBusMessageValidity; +#include dbus_bool_t _dbus_hash_test (void); dbus_bool_t _dbus_dict_test (void); @@ -61,19 +54,16 @@ dbus_bool_t _dbus_pending_call_test (const char *test_data_dir); void dbus_internal_do_not_use_run_tests (const char *test_data_dir); dbus_bool_t dbus_internal_do_not_use_try_message_file (const DBusString *filename, - dbus_bool_t is_raw, - DBusMessageValidity expected_validity); + DBusValidity expected_validity); dbus_bool_t dbus_internal_do_not_use_try_message_data (const DBusString *data, - DBusMessageValidity expected_validity); + DBusValidity expected_validity); dbus_bool_t dbus_internal_do_not_use_load_message_file (const DBusString *filename, - dbus_bool_t is_raw, DBusString *data); /* returns FALSE on fatal failure */ typedef dbus_bool_t (* DBusForeachMessageFileFunc) (const DBusString *filename, - dbus_bool_t is_raw, - DBusMessageValidity expected_validity, + DBusValidity expected_validity, void *data); dbus_bool_t dbus_internal_do_not_use_foreach_message_file (const char *test_data_dir, -- cgit