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

[wget] / src / hash.h

diff --git a/src/hash.h b/src/hash.h
index 31c611ee56b235eab5adf4f61379765f9df69bbf..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,8 +14,7 @@ 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/>.
 
 In addition, as a special exception, the Free Software Foundation
 gives permission to link the code of its release of Wget with the
@@ -45,8 +44,16 @@ 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_map (struct hash_table *,
-                    int (*) (void *, void *, void *), void *);
+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);