X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgl_anyhash_list2.h;h=03640f4cbc8ee07acd26e070563f969ecb101e4e;hb=ec60d8959e16a743f09704c397931f2621f511ae;hp=78ee593a803cecaac2c1be427103cb1d34111177;hpb=935e9f0bda3d20a28516e3e369946fe6fbe60043;p=gnulib.git diff --git a/lib/gl_anyhash_list2.h b/lib/gl_anyhash_list2.h index 78ee593a8..03640f4cb 100644 --- a/lib/gl_anyhash_list2.h +++ b/lib/gl_anyhash_list2.h @@ -2,10 +2,10 @@ Copyright (C) 2006 Free Software Foundation, Inc. Written by Bruno Haible , 2006. - This program is free software; you can redistribute it and/or modify + 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, or (at your option) - any later version. + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -13,8 +13,7 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ /* Common code of gl_linkedhash_list.c, gl_avltreehash_list.c, gl_rbtreehash_list.c. */ @@ -100,26 +99,25 @@ hash_resize (gl_list_t list, size_t estimate) { gl_hash_entry_t *old_table = list->table; /* Allocate the new table. */ - gl_hash_entry_t *new_table = - (gl_hash_entry_t *) xzalloc (new_size * sizeof (gl_hash_entry_t)); + gl_hash_entry_t *new_table = XCALLOC (new_size, gl_hash_entry_t); size_t i; /* Iterate through the entries of the old table. */ for (i = list->table_size; i > 0; ) - { - gl_hash_entry_t node = old_table[--i]; + { + gl_hash_entry_t node = old_table[--i]; - while (node != NULL) - { - gl_hash_entry_t next = node->hash_next; - /* Add the entry to the new table. */ - size_t bucket = node->hashcode % new_size; - node->hash_next = new_table[bucket]; - new_table[bucket] = node; + while (node != NULL) + { + gl_hash_entry_t next = node->hash_next; + /* Add the entry to the new table. */ + size_t bucket = node->hashcode % new_size; + node->hash_next = new_table[bucket]; + new_table[bucket] = node; - node = next; - } - } + node = next; + } + } list->table = new_table; list->table_size = new_size;