Vacation work -- see tech log

[bacula/bacula] / bacula / src / lib / htable.h

diff --git a/bacula/src/lib/htable.h b/bacula/src/lib/htable.h
index c358d0e5a87f02dea2b84275363463a531879968..cb18c8fd30adb396496e31bcb2ad2356a86ad1f8 100644 (file)
--- a/bacula/src/lib/htable.h
+++ b/bacula/src/lib/htable.h
@@ -3,7 +3,7 @@
  */
 
 /*
-   Copyright (C) 2000-2003 Kern Sibbald and John Walker
+   Copyright (C) 2003-2005 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -23,7 +23,7 @@
  */
 
 /* ========================================================================
- * 
+ *
  *   Hash table class -- htable
  *
  */
@@ -32,38 +32,39 @@
  * Loop var through each member of table
  */
 #define foreach_htable(var, tbl) \
-        for(((void *)(var))=(tbl)->first(); \
+        for((*((void **)&(var))=(void *)((tbl)->first())); \
             (var); \
-           ((void *)(var))=(tbl)->next())
+            (*((void **)&(var))=(void *)((tbl)->next())))
 
 struct hlink {
-   void *next;                       /* next hash item */
-   char *key;                        /* key this item */
-   uint32_t hash;                    /* hash for this key */
+   void *next;                        /* next hash item */
+   char *key;                         /* key this item */
+   uint32_t hash;                     /* hash for this key */
 };
 
 class htable : public SMARTALLOC {
-   hlink **table;                    /* hash table */
-   int loffset;                      /* link offset in item */
-   uint32_t num_items;               /* current number of items */
-   uint32_t max_items;               /* maximum items before growing */
-   uint32_t buckets;                 /* size of hash table */
-   uint32_t hash;                    /* temp storage */
-   uint32_t index;                   /* temp storage */
+   hlink **table;                     /* hash table */
+   int loffset;                       /* link offset in item */
+   uint32_t num_items;                /* current number of items */
+   uint32_t max_items;                /* maximum items before growing */
+   uint32_t buckets;                  /* size of hash table */
+   uint32_t hash;                     /* temp storage */
+   uint32_t index;                    /* temp storage */
    uint32_t mask;                     /* "remainder" mask */
-   uint32_t rshift;                  /* amount to shift down */
-   hlink *walkptr;                   /* table walk pointer */
-   uint32_t walk_index;              /* table walk index */
-   void hash_index(char *key);       /* produce hash key,index */
-   void grow_table();                /* grow the table */
+   uint32_t rshift;                   /* amount to shift down */
+   hlink *walkptr;                    /* table walk pointer */
+   uint32_t walk_index;               /* table walk index */
+   void hash_index(char *key);        /* produce hash key,index */
+   void grow_table();                 /* grow the table */
 public:
    htable(void *item, void *link, int tsize = 31);
+   ~htable() { destroy(); }
    void init(void *item, void *link, int tsize = 31);
    bool  insert(char *key, void *item);
    void *lookup(char *key);
-   void *first();                    /* get first item in table */
-   void *next();                     /* get next item in table */
+   void *first();                     /* get first item in table */
+   void *next();                      /* get next item in table */
    void destroy();
-   void stats();                     /* print stats about the table */
-   uint32_t size();                  /* return size of table */
+   void stats();                      /* print stats about the table */
+   uint32_t size();                   /* return size of table */
 };