* dict.[ch]: Revert all nonfunctional changes. It's external module

imported from kazlib and it's better not to screw it - there is
	  theoretical chance that we might want to merge changes from upstream
	  at some point. Also avoid the loss of info about upstream version
	  (rcsid).
This commit is contained in:
hasso 2005-09-25 12:04:25 +00:00
parent d24af186ea
commit ffe543af88
3 changed files with 970 additions and 1152 deletions

View File

@ -1,3 +1,11 @@
2005-09-25 Hasso Tepper <hasso at quagga.net>
* dict.[ch]: Revert all nonfunctional changes. It's external module
imported from kazlib and it's better not to screw it - there is
theoretical chance that we might want to merge changes from upstream
at some point. Also avoid the loss of info about upstream version
(rcsid).
2005-09-21 Hasso Tepper <hasso at quagga.net>
* isis_route.c: Fix output of nexthops in case of extreme debug.

File diff suppressed because it is too large Load Diff

View File

@ -14,7 +14,7 @@
* into proprietary software; there is no requirement for such software to
* contain a copyright notice related to this source.
*
* $Id: dict.h,v 1.2 2004/09/10 20:48:21 hasso Exp $
* $Id: dict.h,v 1.3 2005/09/25 12:04:25 hasso Exp $
* $Name: $
*/
@ -31,8 +31,7 @@
*/
#ifdef __cplusplus
extern "C"
{
extern "C" {
#endif
typedef unsigned long dictcount_t;
@ -42,11 +41,9 @@ extern "C"
* The dictionary is implemented as a red-black tree
*/
typedef enum
{ dnode_red, dnode_black } dnode_color_t;
typedef enum { dnode_red, dnode_black } dnode_color_t;
typedef struct dnode_t
{
typedef struct dnode_t {
#if defined(DICT_IMPLEMENTATION) || !defined(KAZLIB_OPAQUE_DEBUG)
struct dnode_t *dict_left;
struct dnode_t *dict_right;
@ -63,8 +60,7 @@ extern "C"
typedef dnode_t *(*dnode_alloc_t)(void *);
typedef void (*dnode_free_t)(dnode_t *, void *);
typedef struct dict_t
{
typedef struct dict_t {
#if defined(DICT_IMPLEMENTATION) || !defined(KAZLIB_OPAQUE_DEBUG)
dnode_t dict_nilnode;
dictcount_t dict_nodecount;
@ -81,8 +77,7 @@ extern "C"
typedef void (*dnode_process_t)(dict_t *, dnode_t *, void *);
typedef struct dict_load_t
{
typedef struct dict_load_t {
#if defined(DICT_IMPLEMENTATION) || !defined(KAZLIB_OPAQUE_DEBUG)
dict_t *dict_dictptr;
dnode_t dict_nilnode;
@ -92,8 +87,7 @@ extern "C"
} dict_load_t;
extern dict_t *dict_create(dictcount_t, dict_comp_t);
extern void dict_set_allocator (dict_t *, dnode_alloc_t, dnode_free_t,
void *);
extern void dict_set_allocator(dict_t *, dnode_alloc_t, dnode_free_t, void *);
extern void dict_destroy(dict_t *);
extern void dict_free_nodes(dict_t *);
extern void dict_free(dict_t *);