kes Apply dvd-handler patch from Richard Mortimer.

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

diff --git a/bacula/src/lib/htable.h b/bacula/src/lib/htable.h
index 2918d58025562939e75d547ab42fa82bdbfcc4fa..ab5a0e1ebf4c93a98f5460fbe022d98520a55c52 100644 (file)
--- a/bacula/src/lib/htable.h
+++ b/bacula/src/lib/htable.h
@@ -1,29 +1,23 @@
 /*
  *   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
  *
  */
@@ -32,9 +26,9 @@
  * 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 */
@@ -58,6 +52,7 @@ class htable : public SMARTALLOC {
    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);