X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dbus%2Fdbus-hash.h;h=5aa183c4b5e97093e3c3ecafcc28ba85c4287dcf;hb=61d97215c317a4154df47fbfb882aab60b92fbab;hp=58fd5bf85d226c78a98ecb74bcbcd1300341b350;hpb=9f1a60dbba69844c0a04b3dd86280352736187ce;p=platform%2Fupstream%2Fdbus.git diff --git a/dbus/dbus-hash.h b/dbus/dbus-hash.h index 58fd5bf..5aa183c 100644 --- a/dbus/dbus-hash.h +++ b/dbus/dbus-hash.h @@ -1,9 +1,9 @@ -/* -*- mode: C; c-file-style: "gnu" -*- */ -/* dbus-hash.h Generic hash table utility (internal to D-BUS implementation) +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ +/* 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 + * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,17 +17,31 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ #ifndef DBUS_HASH_H #define DBUS_HASH_H +#ifdef HAVE_STDINT_H +#include +#endif + +#ifdef HAVE_INTTYPES_H +#include +#endif + #include #include +#include + +DBUS_BEGIN_DECLS -DBUS_BEGIN_DECLS; +/** + * @addtogroup DBusHashTable + * @{ + */ /** Hash iterator object. The iterator is on the stack, but its real * fields are hidden privately. @@ -53,16 +67,16 @@ typedef struct DBusHashIter DBusHashIter; typedef enum { 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. */ + DBUS_HASH_UINTPTR /**< Hash keys are integer capable to hold a pointer. */ } DBusHashType; + DBusHashTable* _dbus_hash_table_new (DBusHashType type, DBusFreeFunction key_free_function, DBusFreeFunction value_free_function); DBusHashTable* _dbus_hash_table_ref (DBusHashTable *table); void _dbus_hash_table_unref (DBusHashTable *table); +void _dbus_hash_table_remove_all (DBusHashTable *table); void _dbus_hash_iter_init (DBusHashTable *table, DBusHashIter *iter); dbus_bool_t _dbus_hash_iter_next (DBusHashIter *iter); @@ -72,50 +86,37 @@ 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); +uintptr_t _dbus_hash_iter_get_uintptr_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); +void* _dbus_hash_table_lookup_uintptr (DBusHashTable *table, + uintptr_t 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_remove_uintptr (DBusHashTable *table, + uintptr_t 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, +dbus_bool_t _dbus_hash_table_insert_uintptr (DBusHashTable *table, + uintptr_t key, void *value); int _dbus_hash_table_get_n_entries (DBusHashTable *table); /* Preallocation */ + +/** A preallocated hash entry */ typedef struct DBusPreallocatedHash DBusPreallocatedHash; DBusPreallocatedHash *_dbus_hash_table_preallocate_entry (DBusHashTable *table); @@ -126,7 +127,8 @@ void _dbus_hash_table_insert_string_preallocated (DBusHashTable char *key, void *value); +/** @} */ -DBUS_END_DECLS; +DBUS_END_DECLS #endif /* DBUS_HASH_H */