From 3a99b017b3c7962685444ab1626f6c758b909a24 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Sun, 11 Jul 1999 17:13:36 +0000 Subject: [PATCH] * elf.c (bfd_elf_hash): Change parameter from unsigned char * to char *. * elf-bfd.h (bfd_elf_hash): Update declaration. * elflink.h (NAME(bfd_elf,size_dynamic_sections)): Remove casts when calling bfd_elf_hash. --- bfd/ChangeLog | 8 ++++++++ bfd/elf-bfd.h | 2 +- bfd/elf.c | 6 ++++-- bfd/elflink.h | 9 ++++----- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 8d327d29c7..f9421e5919 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +1999-07-11 Ian Lance Taylor + + * elf.c (bfd_elf_hash): Change parameter from unsigned char * to + char *. + * elf-bfd.h (bfd_elf_hash): Update declaration. + * elflink.h (NAME(bfd_elf,size_dynamic_sections)): Remove casts + when calling bfd_elf_hash. + 1999-07-11 Mark Mitchell * libbfd.c (bfd_put_8): Make it of type `void'. diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h index 402d75e42e..be6185b68f 100644 --- a/bfd/elf-bfd.h +++ b/bfd/elf-bfd.h @@ -877,7 +877,7 @@ extern void bfd_elf_print_symbol PARAMS ((bfd *, PTR, asymbol *, #define bfd_elf32_print_symbol bfd_elf_print_symbol #define bfd_elf64_print_symbol bfd_elf_print_symbol -extern unsigned long bfd_elf_hash PARAMS ((CONST unsigned char *)); +extern unsigned long bfd_elf_hash PARAMS ((const char *)); extern bfd_reloc_status_type bfd_elf_generic_reloc PARAMS ((bfd *, arelent *, diff --git a/bfd/elf.c b/bfd/elf.c index 4db37c4685..65bba6124a 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -200,10 +200,12 @@ _bfd_elf_swap_versym_out (abfd, src, dst) /* Standard ELF hash function. Do not change this function; you will cause invalid hash tables to be generated. */ + unsigned long -bfd_elf_hash (name) - CONST unsigned char *name; +bfd_elf_hash (namearg) + const char *namearg; { + const unsigned char *name = (const unsigned char *) namearg; unsigned long h = 0; unsigned long g; int ch; diff --git a/bfd/elflink.h b/bfd/elflink.h index db536c9134..fc07d7d8ea 100644 --- a/bfd/elflink.h +++ b/bfd/elflink.h @@ -2800,7 +2800,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath, if (soname_indx != (bfd_size_type) -1) { - def.vd_hash = bfd_elf_hash ((const unsigned char *) soname); + def.vd_hash = bfd_elf_hash (soname); defaux.vda_name = soname_indx; } else @@ -2809,7 +2809,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath, bfd_size_type indx; name = output_bfd->filename; - def.vd_hash = bfd_elf_hash ((const unsigned char *) name); + def.vd_hash = bfd_elf_hash (name); indx = _bfd_stringtab_add (elf_hash_table (info)->dynstr, name, true, false); if (indx == (bfd_size_type) -1) @@ -2857,7 +2857,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath, def.vd_flags |= VER_FLG_WEAK; def.vd_ndx = t->vernum + 1; def.vd_cnt = cdeps + 1; - def.vd_hash = bfd_elf_hash ((const unsigned char *) t->name); + def.vd_hash = bfd_elf_hash (t->name); def.vd_aux = sizeof (Elf_External_Verdef); if (t->next != NULL) def.vd_next = (sizeof (Elf_External_Verdef) @@ -2993,8 +2993,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath, for (a = t->vn_auxptr; a != NULL; a = a->vna_nextptr) { - a->vna_hash = bfd_elf_hash ((const unsigned char *) - a->vna_nodename); + a->vna_hash = bfd_elf_hash (a->vna_nodename); indx = _bfd_stringtab_add (elf_hash_table (info)->dynstr, a->vna_nodename, true, false); if (indx == (bfd_size_type) -1)