#ifndef __RB_DICTIONARY_H__
#define __RB_DICTIONARY_H__
-struct Dictionary; /* defined in src/dictionary.c */
+#include "librb-config.h"
+
+typedef struct rb_dictionary rb_dictionary;
+typedef struct rb_dictionary_element rb_dictionary_element;
+typedef struct rb_dictionary_iter rb_dictionary_iter;
+
+struct rb_dictionary;
typedef int (*DCF)(/* const void *a, const void *b */);
-struct DictionaryElement
+struct rb_dictionary_element
{
- struct DictionaryElement *left, *right, *prev, *next;
+ rb_dictionary_element *left, *right, *prev, *next;
void *data;
const void *key;
int position;
};
-struct DictionaryIter
+struct rb_dictionary_iter
{
- struct DictionaryElement *cur, *next;
+ rb_dictionary_element *cur, *next;
};
/*
* this is a convenience macro for inlining iteration of dictionaries.
*/
-#define DICTIONARY_FOREACH(element, state, dict) for (rb_dictionary_foreach_start((dict), (state)); (element = rb_dictionary_foreach_cur((dict), (state))); rb_dictionary_foreach_next((dict), (state)))
+#define RB_DICTIONARY_FOREACH(element, state, dict) for (rb_dictionary_foreach_start((dict), (state)); (element = rb_dictionary_foreach_cur((dict), (state))); rb_dictionary_foreach_next((dict), (state)))
/*
* rb_dictionary_create_named() creates a new dictionary tree which has a name.
* name is the name, compare_cb is the comparator.
*/
-extern struct Dictionary *rb_dictionary_create(const char *name, DCF compare_cb);
+extern rb_dictionary *rb_dictionary_create(const char *name, DCF compare_cb);
/*
* rb_dictionary_set_comparator_func() resets the comparator used for lookups and
* insertions in the DTree structure.
*/
-extern void rb_dictionary_set_comparator_func(struct Dictionary *dict,
+extern void rb_dictionary_set_comparator_func(rb_dictionary *dict,
DCF compare_cb);
/*
* rb_dictionary_get_comparator_func() returns the comparator used for lookups and
* insertions in the DTree structure.
*/
-extern DCF rb_dictionary_get_comparator_func(struct Dictionary *dict);
+extern DCF rb_dictionary_get_comparator_func(rb_dictionary *dict);
/*
* rb_dictionary_get_linear_index() returns the linear index of an object in the
* DTree structure.
*/
-extern int rb_dictionary_get_linear_index(struct Dictionary *dict, const void *key);
+extern int rb_dictionary_get_linear_index(rb_dictionary *dict, const void *key);
/*
* rb_dictionary_destroy() destroys all entries in a dtree, and also optionally calls
* a defined callback function to destroy any data attached to it.
*/
-extern void rb_dictionary_destroy(struct Dictionary *dtree,
- void (*destroy_cb)(struct DictionaryElement *delem, void *privdata),
+extern void rb_dictionary_destroy(rb_dictionary *dtree,
+ void (*destroy_cb)(rb_dictionary_element *delem, void *privdata),
void *privdata);
/*
*
* To shortcircuit iteration, return non-zero from the callback function.
*/
-extern void rb_dictionary_foreach(struct Dictionary *dtree,
- int (*foreach_cb)(struct DictionaryElement *delem, void *privdata),
+extern void rb_dictionary_foreach(rb_dictionary *dtree,
+ int (*foreach_cb)(rb_dictionary_element *delem, void *privdata),
void *privdata);
/*
* When the object is found, a non-NULL is returned from the callback, which results
* in that object being returned to the user.
*/
-extern void *rb_dictionary_search(struct Dictionary *dtree,
- void *(*foreach_cb)(struct DictionaryElement *delem, void *privdata),
+extern void *rb_dictionary_search(rb_dictionary *dtree,
+ void *(*foreach_cb)(rb_dictionary_element *delem, void *privdata),
void *privdata);
/*
* in progress at a time, it is permitted to remove the current element
* of the iteration (but not any other element).
*/
-extern void rb_dictionary_foreach_start(struct Dictionary *dtree,
- struct DictionaryIter *state);
+extern void rb_dictionary_foreach_start(rb_dictionary *dtree,
+ rb_dictionary_iter *state);
/*
* rb_dictionary_foreach_cur() returns the current element of the iteration,
* or NULL if there are no more elements.
*/
-extern void *rb_dictionary_foreach_cur(struct Dictionary *dtree,
- struct DictionaryIter *state);
+extern void *rb_dictionary_foreach_cur(rb_dictionary *dtree,
+ rb_dictionary_iter *state);
/*
* rb_dictionary_foreach_next() moves to the next element.
*/
-extern void rb_dictionary_foreach_next(struct Dictionary *dtree,
- struct DictionaryIter *state);
+extern void rb_dictionary_foreach_next(rb_dictionary *dtree,
+ rb_dictionary_iter *state);
/*
* rb_dictionary_add() adds a key->value entry to the dictionary tree.
*/
-extern struct DictionaryElement *rb_dictionary_add(struct Dictionary *dtree, const void *key, void *data);
+extern rb_dictionary_element *rb_dictionary_add(rb_dictionary *dtree, const void *key, void *data);
/*
- * rb_dictionary_find() returns a struct DictionaryElement container from a dtree for key 'key'.
+ * rb_dictionary_find() returns a rb_dictionary_element container from a dtree for key 'key'.
*/
-extern struct DictionaryElement *rb_dictionary_find(struct Dictionary *dtree, const void *key);
+extern rb_dictionary_element *rb_dictionary_find(rb_dictionary *dtree, const void *key);
/*
* rb_dictionary_find() returns data from a dtree for key 'key'.
*/
-extern void *rb_dictionary_retrieve(struct Dictionary *dtree, const void *key);
+extern void *rb_dictionary_retrieve(rb_dictionary *dtree, const void *key);
/*
* rb_dictionary_delete() deletes a key->value entry from the dictionary tree.
*/
-extern void *rb_dictionary_delete(struct Dictionary *dtree, const void *key);
+extern void *rb_dictionary_delete(rb_dictionary *dtree, const void *key);
/*
* rb_dictionary_size() returns the number of elements in a dictionary tree.
*/
-extern unsigned int rb_dictionary_size(struct Dictionary *dtree);
+extern unsigned int rb_dictionary_size(rb_dictionary *dtree);
-void rb_dictionary_stats(struct Dictionary *dict, void (*cb)(const char *line, void *privdata), void *privdata);
+void rb_dictionary_stats(rb_dictionary *dict, void (*cb)(const char *line, void *privdata), void *privdata);
void rb_dictionary_stats_walk(void (*cb)(const char *line, void *privdata), void *privdata);
+#ifndef _WIN32
+
#define RB_POINTER_TO_INT(x) ((int32_t) (long) (x))
#define RB_INT_TO_POINTER(x) ((void *) (long) (int32_t) (x))
#define RB_POINTER_TO_UINT(x) ((uint32_t) (unsigned long) (x))
#define RB_UINT_TO_POINTER(x) ((void *) (unsigned long) (uint32_t) (x))
-#define RB_POINTER_TO_LONG(x) ((int64_t) (unsigned long long) (x))
-#define RB_LONG_TO_POINTER(x) ((void *) (unsigned long long) (int64_t) (x))
+#else
-#define RB_POINTER_TO_ULONG(x) ((uint64_t) (unsigned long long) (x))
-#define RB_ULONG_TO_POINTER(x) ((void *) (unsigned long long) (uint64_t) (x))
+#define RB_POINTER_TO_INT(x) ((int32_t) (unsigned long long) (x))
+#define RB_INT_TO_POINTER(x) ((void *) (unsigned long long) (int32_t) (x))
+
+#define RB_POINTER_TO_UINT(x) ((uint32_t) (unsigned long long) (x))
+#define RB_UINT_TO_POINTER(x) ((void *) (unsigned long long) (uint32_t) (x))
+
+#endif
static inline int rb_int32cmp(const void *a, const void *b)
{
return RB_POINTER_TO_UINT(b) - RB_POINTER_TO_UINT(a);
}
-static inline int rb_int64cmp(const void *a, const void *b)
-{
- return RB_POINTER_TO_LONG(b) - RB_POINTER_TO_LONG(a);
-}
-
-static inline int rb_uint64cmp(const void *a, const void *b)
-{
- return RB_POINTER_TO_ULONG(b) - RB_POINTER_TO_ULONG(a);
-}
-
#endif