X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fhash.h;h=99b0957489595bc0d4fc7ea13e9bf48d95c3182d;hp=6003af1aefbff8ac1bf51c2283d7f0e9199b6221;hb=8624553a31b148f9051cc11725bc01d9760fa07b;hpb=53d0aff795316dc1a4b785632f0d4d93c861e9cb diff --git a/src/hash.h b/src/hash.h index 6003af1a..99b09574 100644 --- a/src/hash.h +++ b/src/hash.h @@ -1,5 +1,6 @@ /* Hash table declarations. - Copyright (C) 2000, 2007 Free Software Foundation, Inc. + Copyright (C) 2000, 2007, 2008, 2009, 2010, 2011 Free Software + Foundation, Inc. This file is part of GNU Wget. @@ -16,15 +17,16 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Wget. If not, see . -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. */ +Additional permission under GNU GPL version 3 section 7 + +If you modify this program, or any covered work, by linking or +combining it with the OpenSSL project's OpenSSL library (or a +modified version of that library), containing parts covered by the +terms of the OpenSSL or SSLeay licenses, the Free Software Foundation +grants you additional permission to convey the resulting work. +Corresponding Source for a non-source form of such a combination +shall include the source code for the parts of OpenSSL used as well +as that of the covered work. */ #ifndef HASH_H #define HASH_H @@ -32,7 +34,7 @@ so, delete this exception statement from your version. */ struct hash_table; struct hash_table *hash_table_new (int, unsigned long (*) (const void *), - int (*) (const void *, const void *)); + int (*) (const void *, const void *)); void hash_table_destroy (struct hash_table *); void *hash_table_get (const struct hash_table *, const void *); @@ -40,16 +42,16 @@ 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 *); +void hash_table_put (struct hash_table *, const void *, const 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 *); + int (*) (void *, void *, void *), void *); typedef struct { - void *key, *value; /* public members */ - void *pos, *end; /* private members */ + 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 *);