[svn] Merge of fix for bugs 20341 and 20410.

[wget] / src / hash.h

diff --git a/src/hash.h b/src/hash.h
index fffe91b1465ce30b542f69f45777a63129116a91..2c0368485e1e316cbe82dce585ba129cfe706c96 100644 (file)
--- a/src/hash.h
+++ b/src/hash.h
@@ -5,7 +5,7 @@ This file is part of GNU Wget.
 
 GNU Wget 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
+the Free Software Foundation; either version 3 of the License, or
 (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,
@@ -14,44 +14,51 @@ 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 Wget; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.
 
-/* From XEmacs, and hence from Dragon book. */
+In addition, as a special exception, the Free Software Foundation
+gives permission to link the code of its release of Wget with the
+OpenSSL project's "OpenSSL" library (or with modified versions of it
+that use the same license as the "OpenSSL" library), and distribute
+the linked executables.  You must obey the GNU General Public License
+in all respects for all of the code used other than "OpenSSL".  If you
+modify this file, you may extend this exception to your version of the
+file, but you are not obligated to do so.  If you do not wish to do
+so, delete this exception statement from your version.  */
 
-#define GOOD_HASH 65599 /* prime number just over 2^16; Dragon book, p. 435 */
-#define HASH2(a,b)               (GOOD_HASH * (a)                     + (b))
-#define HASH3(a,b,c)             (GOOD_HASH * HASH2 (a,b)             + (c))
-#define HASH4(a,b,c,d)           (GOOD_HASH * HASH3 (a,b,c)           + (d))
-#define HASH5(a,b,c,d,e)         (GOOD_HASH * HASH4 (a,b,c,d)         + (e))
-#define HASH6(a,b,c,d,e,f)       (GOOD_HASH * HASH5 (a,b,c,d,e)       + (f))
-#define HASH7(a,b,c,d,e,f,g)     (GOOD_HASH * HASH6 (a,b,c,d,e,f)     + (g))
-#define HASH8(a,b,c,d,e,f,g,h)   (GOOD_HASH * HASH7 (a,b,c,d,e,f,g)   + (h))
-#define HASH9(a,b,c,d,e,f,g,h,i) (GOOD_HASH * HASH8 (a,b,c,d,e,f,g,h) + (i))
+#ifndef HASH_H
+#define HASH_H
 
 struct hash_table;
 
-struct hash_table *hash_table_new PARAMS ((int,
-                                          unsigned long (*) (const void *),
-                                          int (*) (const void *,
-                                                   const void *)));
-void hash_table_destroy PARAMS ((struct hash_table *));
-
-void *hash_table_get PARAMS ((struct hash_table *, const void *));
-int hash_table_get_pair PARAMS ((struct hash_table *, const void *,
-                                void *, void *));
-int hash_table_contains PARAMS ((struct hash_table *, const void *));
-
-void hash_table_put PARAMS ((struct hash_table *, const void *, void *));
-int hash_table_remove PARAMS ((struct hash_table *, const void *));
-void hash_table_clear PARAMS ((struct hash_table *));
-
-void hash_table_map PARAMS ((struct hash_table *,
-                            int (*) (void *, void *, void *),
-                            void *));
-int hash_table_count PARAMS ((struct hash_table *));
-
-unsigned long string_hash PARAMS ((const void *));
-int string_cmp PARAMS ((const void *, const void *));
-struct hash_table *make_string_hash_table PARAMS ((int));
-struct hash_table *make_nocase_string_hash_table PARAMS ((int));
+struct hash_table *hash_table_new (int, unsigned long (*) (const void *),
+                                  int (*) (const void *, const void *));
+void hash_table_destroy (struct hash_table *);
+
+void *hash_table_get (const struct hash_table *, const void *);
+int hash_table_get_pair (const struct hash_table *, const void *,
+                         void *, void *);
+int hash_table_contains (const struct hash_table *, const void *);
+
+void hash_table_put (struct hash_table *, const void *, void *);
+int hash_table_remove (struct hash_table *, const void *);
+void hash_table_clear (struct hash_table *);
+
+void hash_table_for_each (struct hash_table *,
+                         int (*) (void *, void *, void *), void *);
+
+typedef struct {
+  void *key, *value;           /* public members */
+  void *pos, *end;             /* private members */
+} hash_table_iterator;
+void hash_table_iterate (struct hash_table *, hash_table_iterator *);
+int hash_table_iter_next (hash_table_iterator *);
+
+int hash_table_count (const struct hash_table *);
+
+struct hash_table *make_string_hash_table (int);
+struct hash_table *make_nocase_string_hash_table (int);
+
+unsigned long hash_pointer (const void *);
+
+#endif /* HASH_H */