aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2009-09-09 21:38:59 +0000
committerNick Clifton <nickc@redhat.com>2009-09-09 21:38:59 +0000
commita50b1753d42fa4c760f96d72890684d3a3a221d0 (patch)
treef12568b0c07c392823cc1f9f284fc1984ad6e131 /bfd/hash.c
parentmerge from gcc (diff)
downloadbinutils-gdb-a50b1753d42fa4c760f96d72890684d3a3a221d0.tar.gz
binutils-gdb-a50b1753d42fa4c760f96d72890684d3a3a221d0.tar.bz2
binutils-gdb-a50b1753d42fa4c760f96d72890684d3a3a221d0.zip
Updated soruces in bfd/* to compile cleanly with -Wc++-compat.
* bfd/aoutx.h: Add casts. * bfd/archive.c: Add casts. * bfd/archive64.c: Add casts. * bfd/archures.c: Add casts. * bfd/bfd-in2.h: Regenerated. * bfd/bfd.c: Add casts. (enum bfd_direction): Move out to top level. * bfd/bfdio.c: Add casts. * bfd/binary.c: Add casts. * bfd/cache.c (cache_bseek,cache_bread_1,cache_bwrite): Updated parameter to use enum value instead of int. * bfd/coffcode.h: Add casts. * bfd/coffgen.c: Add casts. * bfd/cofflink.c: Add casts. * bfd/compress.c: Add casts. * bfd/dwarf1.c: Add casts. * bfd/dwarf2.c: Add casts. (struct dwarf2_debug): Rename member bfd to bfd_ptr. Update code to use new name. * bfd/elf-attrs.c: Add casts. * bfd/elf-bfd.h (elf_link_virtual_table_entry): Gives name to anonymous struct. (union gotplt_union, struct elf_link_virtual_table_entry): Move to top level. * bfd/elf-eh-frame.c: Add casts. * bfd/elf-strtab.c: Add casts. * bfd/elf.c: Add casts. (_bfd_elm_make_Section_from_phdr): Change argument name from typename to type_name. * bfd/elf32-i386.c: Add casts. * bfd/elf64-x86-64.c: Add casts. * bfd/elfcode.h: Add casts. * bfd/elfcore.h: Add casts. * bfd/elflink.c: Add casts. * bfd/format.c: Add casts. * bfd/hash.c: Add casts. * bfd/ihex.c: Add casts. * bfd/libaout.h (enum aout_subformat, enum aout_magic): Move to top level. * bfd/libbfd.c: Add casts. * bfd/linker.c: Add casts. * bfd/merge.c: Add casts. * bfd/opncls.c: Add casts. * bfd/peXXigen.c: Add casts. * bfd/peicode.h: Add casts. * bfd/reloc.c: Add casts. * bfd/section.c: Add casts. * bfd/simple.c: Add casts. * bfd/srec.c: Add casts. * bfd/stabs.c: Add casts. * bfd/syms.c: Add casts. * bfd/targets.c: Add casts. * bfd/tekhex.c: Add casts. * bfd/verilog.c: Add casts. * include/bfdlink.h (struct bfd_link_hash_common_entry): Move to top level.
Diffstat (limited to 'bfd/hash.c')
-rw-r--r--bfd/hash.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/bfd/hash.c b/bfd/hash.c
index e9017b7e463..5223e21d2ce 100644
--- a/bfd/hash.c
+++ b/bfd/hash.c
@@ -374,7 +374,8 @@ bfd_hash_table_init_n (struct bfd_hash_table *table,
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);
@@ -407,7 +408,7 @@ bfd_hash_table_init (struct bfd_hash_table *table,
void
bfd_hash_table_free (struct bfd_hash_table *table)
{
- objalloc_free (table->memory);
+ objalloc_free ((struct objalloc *) table->memory);
table->memory = NULL;
}
@@ -581,7 +582,8 @@ bfd_hash_newfunc (struct bfd_hash_entry *entry,
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;
}
@@ -676,7 +678,8 @@ strtab_hash_newfunc (struct bfd_hash_entry *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;
@@ -708,7 +711,7 @@ _bfd_stringtab_init (void)
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;
@@ -771,7 +774,8 @@ _bfd_stringtab_add (struct bfd_strtab_hash *tab,
}
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)
@@ -780,7 +784,7 @@ _bfd_stringtab_add (struct bfd_strtab_hash *tab,
{
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;