/* hash.c -- hash table routines for BFD
Copyright 1993, 1994, 1995, 1997, 1999, 2001, 2002, 2003, 2004, 2005,
- 2006, 2007 Free Software Foundation, Inc.
+ 2006, 2007, 2009 Free Software Foundation, Inc.
Written by Steve Chamberlain <sac@cygnus.com>
This file is part of BFD, the Binary File Descriptor library.
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
+ 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,
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. */
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+ MA 02110-1301, USA. */
#include "sysdep.h"
#include "bfd.h"
bfd_set_error (bfd_error_no_memory);
return FALSE;
}
- table->table = objalloc_alloc ((struct objalloc *) table->memory, alloc);
+ table->table = (struct bfd_hash_entry **)
+ objalloc_alloc ((struct objalloc *) table->memory, alloc);
if (table->table == NULL)
{
bfd_set_error (bfd_error_no_memory);
void
bfd_hash_table_free (struct bfd_hash_table *table)
{
- objalloc_free (table->memory);
+ objalloc_free ((struct objalloc *) table->memory);
table->memory = NULL;
}
if (! create)
return NULL;
- hashp = (*table->newfunc) (NULL, table, string);
- if (hashp == NULL)
- return NULL;
if (copy)
{
- char *new;
+ char *new_string;
- new = objalloc_alloc ((struct objalloc *) table->memory, len + 1);
- if (!new)
+ new_string = (char *) objalloc_alloc ((struct objalloc *) table->memory,
+ len + 1);
+ if (!new_string)
{
bfd_set_error (bfd_error_no_memory);
return NULL;
}
- memcpy (new, string, len + 1);
- string = new;
+ memcpy (new_string, string, len + 1);
+ string = new_string;
}
+
+ return bfd_hash_insert (table, string, hash);
+}
+
+/* Insert an entry in a hash table. */
+
+struct bfd_hash_entry *
+bfd_hash_insert (struct bfd_hash_table *table,
+ const char *string,
+ unsigned long hash)
+{
+ struct bfd_hash_entry *hashp;
+ unsigned int index;
+
+ hashp = (*table->newfunc) (NULL, table, string);
+ if (hashp == NULL)
+ return NULL;
hashp->string = string;
hashp->hash = hash;
+ index = hash % table->size;
hashp->next = table->table[index];
table->table[index] = hashp;
table->count++;
newtable = ((struct bfd_hash_entry **)
objalloc_alloc ((struct objalloc *) table->memory, alloc));
+ if (newtable == NULL)
+ {
+ table->frozen = 1;
+ return hashp;
+ }
memset ((PTR) newtable, 0, alloc);
for (hi = 0; hi < table->size; hi ++)
{
struct bfd_hash_entry *chain = table->table[hi];
struct bfd_hash_entry *chain_end = chain;
- int index;
while (chain_end->next && chain_end->next->hash == chain->hash)
chain_end = chain_end->next;
const char *string ATTRIBUTE_UNUSED)
{
if (entry == NULL)
- entry = bfd_hash_allocate (table, sizeof (* entry));
+ entry = (struct bfd_hash_entry *) bfd_hash_allocate (table,
+ sizeof (* entry));
return entry;
}
/* Allocate the structure if it has not already been allocated by a
subclass. */
if (ret == NULL)
- ret = bfd_hash_allocate (table, sizeof (* ret));
+ ret = (struct strtab_hash_entry *) bfd_hash_allocate (table,
+ sizeof (* ret));
if (ret == NULL)
return NULL;
struct bfd_strtab_hash *table;
bfd_size_type amt = sizeof (* table);
- table = bfd_malloc (amt);
+ table = (struct bfd_strtab_hash *) bfd_malloc (amt);
if (table == NULL)
return NULL;
}
else
{
- entry = bfd_hash_allocate (&tab->table, sizeof (* entry));
+ entry = (struct strtab_hash_entry *) bfd_hash_allocate (&tab->table,
+ sizeof (* entry));
if (entry == NULL)
return (bfd_size_type) -1;
if (! copy)
{
char *n;
- n = bfd_hash_allocate (&tab->table, strlen (str) + 1);
+ n = (char *) bfd_hash_allocate (&tab->table, strlen (str) + 1);
if (n == NULL)
return (bfd_size_type) -1;
entry->root.string = n;