2003-08-17 Havoc Pennington <hp@pobox.com>

	This doesn't compile yet, but syncing up so I can hack on it from
	work. What are branches for if not broken code? ;-)

	* dbus/dbus-protocol.h: remove DBUS_HEADER_FIELD_NAME, add
	DBUS_HEADER_FIELD_INTERFACE, DBUS_HEADER_FIELD_MEMBER,
	DBUS_HEADER_FIELD_ERROR_NAME

	* dbus/dbus-hash.c: Introduce DBUS_HASH_TWO_STRINGS as hack to use
	for the interface+member pairs
	(string_hash): change to use g_str_hash algorithm
	(find_direct_function, find_string_function): refactor these to
	share most code.

	* dbus/dbus-message.c: port all of this over to support
	interface/member fields instead of name field

	* dbus/dbus-object-registry.c: port over

	* dbus/dbus-string.c (_dbus_string_validate_interface): rename
	from _dbus_string_validate_name

	* bus/dbus-daemon-1.1: change file format for the
	<deny>/<allow> stuff to match new message naming scheme

	* bus/policy.c: port over

	* bus/config-parser.c: parse new format

1 files changed, 61 insertions, 54 deletions

diff --git a/dbus/dbus-hash.h b/dbus/dbus-hash.h
index 566d4021..25b81dd6 100644
--- a/dbus/dbus-hash.h
+++ b/dbus/dbus-hash.h
@@ -52,61 +52,68 @@ typedef struct DBusHashIter  DBusHashIter;
  */
 typedef enum
 {
-  DBUS_HASH_STRING,  /**< Hash keys are strings. */
-  DBUS_HASH_INT,     /**< Hash keys are integers. */
-  DBUS_HASH_POINTER, /**< Hash keys are pointers. */
-  DBUS_HASH_ULONG    /**< Hash keys are unsigned long. */
+  DBUS_HASH_STRING,        /**< Hash keys are strings. */
+  DBUS_HASH_TWO_STRINGS,   /**< Hash key is two strings in one memory block, i.e. foo\0bar\0 */
+  DBUS_HASH_INT,           /**< Hash keys are integers. */
+  DBUS_HASH_POINTER,       /**< Hash keys are pointers. */
+  DBUS_HASH_ULONG          /**< Hash keys are unsigned long. */
 } DBusHashType;
-
-DBusHashTable* _dbus_hash_table_new            (DBusHashType      type,
-                                                DBusFreeFunction  key_free_function,
-                                                DBusFreeFunction  value_free_function);
-void           _dbus_hash_table_ref            (DBusHashTable    *table);
-void           _dbus_hash_table_unref          (DBusHashTable    *table);
-void           _dbus_hash_iter_init            (DBusHashTable    *table,
-                                                DBusHashIter     *iter);
-dbus_bool_t    _dbus_hash_iter_next            (DBusHashIter     *iter);
-void           _dbus_hash_iter_remove_entry    (DBusHashIter     *iter);
-void*          _dbus_hash_iter_get_value       (DBusHashIter     *iter);
-void           _dbus_hash_iter_set_value       (DBusHashIter     *iter,
-                                                void             *value);
-int            _dbus_hash_iter_get_int_key     (DBusHashIter     *iter);
-const char*    _dbus_hash_iter_get_string_key  (DBusHashIter     *iter);
-unsigned long  _dbus_hash_iter_get_ulong_key   (DBusHashIter     *iter);
-dbus_bool_t    _dbus_hash_iter_lookup          (DBusHashTable    *table,
-                                                void             *key,
-                                                dbus_bool_t       create_if_not_found,
-                                                DBusHashIter     *iter);
-void*          _dbus_hash_table_lookup_string  (DBusHashTable    *table,
-                                                const char       *key);
-void*          _dbus_hash_table_lookup_int     (DBusHashTable    *table,
-                                                int               key);
-void*          _dbus_hash_table_lookup_pointer (DBusHashTable    *table,
-                                                void             *key);
-void*          _dbus_hash_table_lookup_ulong   (DBusHashTable    *table,
-                                                unsigned long     key);
-dbus_bool_t    _dbus_hash_table_remove_string  (DBusHashTable    *table,
-                                                const char       *key);
-dbus_bool_t    _dbus_hash_table_remove_int     (DBusHashTable    *table,
-                                                int               key);
-dbus_bool_t    _dbus_hash_table_remove_pointer (DBusHashTable    *table,
-                                                void             *key);
-dbus_bool_t    _dbus_hash_table_remove_ulong   (DBusHashTable    *table,
-                                                unsigned long     key);
-dbus_bool_t    _dbus_hash_table_insert_string  (DBusHashTable    *table,
-                                                char             *key,
-                                                void             *value);
-dbus_bool_t    _dbus_hash_table_insert_int     (DBusHashTable    *table,
-                                                int               key,
-                                                void             *value);
-dbus_bool_t    _dbus_hash_table_insert_pointer (DBusHashTable    *table,
-                                                void             *key,
-                                                void             *value);
-dbus_bool_t    _dbus_hash_table_insert_ulong   (DBusHashTable    *table,
-                                                unsigned long     key,
-                                                void             *value);
-int            _dbus_hash_table_get_n_entries  (DBusHashTable    *table);
-
+DBusHashTable* _dbus_hash_table_new                (DBusHashType      type,
+                                                    DBusFreeFunction  key_free_function,
+                                                    DBusFreeFunction  value_free_function);
+void           _dbus_hash_table_ref                (DBusHashTable    *table);
+void           _dbus_hash_table_unref              (DBusHashTable    *table);
+void           _dbus_hash_iter_init                (DBusHashTable    *table,
+                                                    DBusHashIter     *iter);
+dbus_bool_t    _dbus_hash_iter_next                (DBusHashIter     *iter);
+void           _dbus_hash_iter_remove_entry        (DBusHashIter     *iter);
+void*          _dbus_hash_iter_get_value           (DBusHashIter     *iter);
+void           _dbus_hash_iter_set_value           (DBusHashIter     *iter,
+                                                    void             *value);
+int            _dbus_hash_iter_get_int_key         (DBusHashIter     *iter);
+const char*    _dbus_hash_iter_get_string_key      (DBusHashIter     *iter);
+const char*    _dbus_hash_iter_get_two_strings_key (DBusHashIter     *iter);
+unsigned long  _dbus_hash_iter_get_ulong_key       (DBusHashIter     *iter);
+dbus_bool_t    _dbus_hash_iter_lookup              (DBusHashTable    *table,
+                                                    void             *key,
+                                                    dbus_bool_t       create_if_not_found,
+                                                    DBusHashIter     *iter);
+void*          _dbus_hash_table_lookup_string      (DBusHashTable    *table,
+                                                    const char       *key);
+void*          _dbus_hash_table_lookup_two_strings (DBusHashTable    *table,
+                                                    const char       *key);
+void*          _dbus_hash_table_lookup_int         (DBusHashTable    *table,
+                                                    int               key);
+void*          _dbus_hash_table_lookup_pointer     (DBusHashTable    *table,
+                                                    void             *key);
+void*          _dbus_hash_table_lookup_ulong       (DBusHashTable    *table,
+                                                    unsigned long     key);
+dbus_bool_t    _dbus_hash_table_remove_string      (DBusHashTable    *table,
+                                                    const char       *key);
+dbus_bool_t    _dbus_hash_table_remove_two_strings (DBusHashTable    *table,
+                                                    const char       *key);
+dbus_bool_t    _dbus_hash_table_remove_int         (DBusHashTable    *table,
+                                                    int               key);
+dbus_bool_t    _dbus_hash_table_remove_pointer     (DBusHashTable    *table,
+                                                    void             *key);
+dbus_bool_t    _dbus_hash_table_remove_ulong       (DBusHashTable    *table,
+                                                    unsigned long     key);
+dbus_bool_t    _dbus_hash_table_insert_string      (DBusHashTable    *table,
+                                                    char             *key,
+                                                    void             *value);
+dbus_bool_t    _dbus_hash_table_insert_two_strings (DBusHashTable    *table,
+                                                    char             *key,
+                                                    void             *value);
+dbus_bool_t    _dbus_hash_table_insert_int         (DBusHashTable    *table,
+                                                    int               key,
+                                                    void             *value);
+dbus_bool_t    _dbus_hash_table_insert_pointer     (DBusHashTable    *table,
+                                                    void             *key,
+                                                    void             *value);
+dbus_bool_t    _dbus_hash_table_insert_ulong       (DBusHashTable    *table,
+                                                    unsigned long     key,
+                                                    void             *value);
+int            _dbus_hash_table_get_n_entries      (DBusHashTable    *table);
 
 /* Preallocation */
 typedef struct DBusPreallocatedHash DBusPreallocatedHash;