19July06

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

diff --git a/bacula/src/lib/htable.h b/bacula/src/lib/htable.h
index e2cb3c3a73d85c466e03c15cf4174fdc70281506..ab5a0e1ebf4c93a98f5460fbe022d98520a55c52 100644 (file)
--- a/bacula/src/lib/htable.h
+++ b/bacula/src/lib/htable.h
@@ -1,40 +1,42 @@
 /*
  *   Version $Id$
  */
-
 /*
-   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
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   modify it under the terms of the GNU General Public License
+   version 2 as amended with additional clauses defined in the
+   file LICENSE in the main source directory.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 
 /* ========================================================================
- * 
+ *
  *   Hash table class -- htable
  *
  */
 
+/*
+ * Loop var through each member of table
+ */
+#define foreach_htable(var, tbl) \
+        for((*((void **)&(var))=(void *)((tbl)->first())); \
+            (var); \
+            (*((void **)&(var))=(void *)((tbl)->next())))
+
 struct hlink {
    void *next;                        /* next hash item */
    char *key;                         /* key this item */
    uint32_t hash;                     /* hash for this key */
 };
 
-class htable {
+class htable : public SMARTALLOC {
    hlink **table;                     /* hash table */
    int loffset;                       /* link offset in item */
    uint32_t num_items;                /* current number of items */
@@ -50,6 +52,7 @@ class htable {
    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);
@@ -58,6 +61,4 @@ public:
    void destroy();
    void stats();                      /* print stats about the table */
    uint32_t size();                   /* return size of table */
-   void * operator new(size_t);
-   void operator delete(void *);
 };