2003-01-05 Havoc Pennington <hp@pobox.com>

[platform/upstream/dbus.git] / dbus / dbus-hash.h

diff --git a/dbus/dbus-hash.h b/dbus/dbus-hash.h
index cc6fb19..dc60679 100644 (file)
--- a/dbus/dbus-hash.h
+++ b/dbus/dbus-hash.h
@@ -1,6 +1,6 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-hash.h  Generic hash table utility (internal to D-BUS implementation)
- *
+/* dbus-hash.h Generic hash table utility (internal to D-BUS implementation)
+ * 
  * Copyright (C) 2002  Red Hat, Inc.
  *
  * Licensed under the Academic Free License version 1.2
@@ -27,7 +27,7 @@
 #include <dbus/dbus-memory.h>
 #include <dbus/dbus-types.h>
 
-DBUS_BEGIN_DECLS
+DBUS_BEGIN_DECLS;
 
 /* The iterator is on the stack, but its real fields are
  * hidden privately.
@@ -53,7 +53,8 @@ typedef struct DBusHashIter  DBusHashIter;
 typedef enum
 {
   DBUS_HASH_STRING, /**< Hash keys are strings. */
-  DBUS_HASH_INT     /**< Hash keys are integers. */
+  DBUS_HASH_INT,    /**< Hash keys are integers. */
+  DBUS_HASH_POINTER /**< Hash keys are pointers. */
 } DBusHashType;
 
 DBusHashTable* _dbus_hash_table_new   (DBusHashType     type,
@@ -66,34 +67,40 @@ 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);
-
-dbus_bool_t _dbus_hash_iter_lookup         (DBusHashTable *table,
-                                            void          *key,
-                                            dbus_bool_t    create_if_not_found,
-                                            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);
+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);
+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_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);
+int         _dbus_hash_table_get_n_entries  (DBusHashTable *table);
 
-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_remove_string (DBusHashTable *table,
-                                            const char    *key);
-void        _dbus_hash_table_remove_int    (DBusHashTable *table,
-                                            int            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);
-int         _dbus_hash_table_get_n_entries (DBusHashTable *table);
 
-DBUS_END_DECLS
+DBUS_END_DECLS;
 
 #endif /* DBUS_HASH_H */