* cpu-z8k.c: Convert to ISO C90.

	* coff-z8k.c: Likewise.

3 files changed, 20 insertions, 156 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9b717d51ea..bb69c7fcdd 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-28  Christian Groessler  <chris@groessler.org>
+
+	* cpu-z8k.c: Convert to ISO C90.
+	* coff-z8k.c: Likewise.
+
 2003-11-27  Alexandre Oliva  <aoliva@redhat.com>
 
 	* elf-bfd.h (elf_backend_data::elf_backend_modify_segment_map):
diff --git a/bfd/coff-z8k.c b/bfd/coff-z8k.c
index db55cc1355..cf4da77c29 100644
--- a/bfd/coff-z8k.c
+++ b/bfd/coff-z8k.c
@@ -28,11 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "coff/internal.h"
 #include "libcoff.h"
 
-static void extra_case PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *, arelent *, bfd_byte *, unsigned int *, unsigned int *));
-static void reloc_processing PARAMS ((arelent *, struct internal_reloc *, asymbol **, bfd *, asection *));
-static void rtype2howto PARAMS ((arelent *, struct internal_reloc *));
-static int coff_z8k_select_reloc PARAMS ((reloc_howto_type *));
-
 #define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (1)
 
 static reloc_howto_type r_imm32 =
@@ -74,8 +69,7 @@ HOWTO (R_CALLR, 0, 1, 12, TRUE, 0, complain_overflow_signed, 0,
 /* Turn a howto into a reloc number */
 
 static int
-coff_z8k_select_reloc (howto)
-     reloc_howto_type *howto;
+coff_z8k_select_reloc (reloc_howto_type *howto)
 {
   return howto->type;
 }
@@ -96,9 +90,7 @@ coff_z8k_select_reloc (howto)
 /* Code to turn a r_type into a howto ptr, uses the above howto table.  */
 
 static void
-rtype2howto (internal, dst)
-     arelent * internal;
-     struct internal_reloc *dst;
+rtype2howto (arelent *internal, struct internal_reloc *dst)
 {
   switch (dst->r_type)
     {
@@ -143,12 +135,11 @@ rtype2howto (internal, dst)
  reloc_processing(relent, reloc, symbols, abfd, section)
 
 static void
-reloc_processing (relent, reloc, symbols, abfd, section)
-     arelent * relent;
-     struct internal_reloc * reloc;
-     asymbol ** symbols;
-     bfd * abfd;
-     asection * section;
+reloc_processing (arelent *relent,
+                  struct internal_reloc *reloc,
+                  asymbol **symbols,
+                  bfd *abfd,
+                  asection *section)
 {
   relent->address = reloc->r_vaddr;
   rtype2howto (relent, reloc);
@@ -163,14 +154,13 @@ reloc_processing (relent, reloc, symbols, abfd, section)
 }
 
 static void
-extra_case (in_abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr)
-     bfd * in_abfd;
-     struct bfd_link_info * link_info;
-     struct bfd_link_order * link_order;
-     arelent * reloc;
-     bfd_byte * data;
-     unsigned int * src_ptr;
-     unsigned int * dst_ptr;
+extra_case (bfd *in_abfd,
+            struct bfd_link_info *link_info,
+            struct bfd_link_order *link_order,
+            arelent *reloc,
+            bfd_byte *data,
+            unsigned int *src_ptr,
+            unsigned int *dst_ptr)
 {
   asection * input_section = link_order->u.indirect.section;
 
diff --git a/bfd/cpu-z8k.c b/bfd/cpu-z8k.c
index 3ccedf6ea9..d1ea14c330 100644
--- a/bfd/cpu-z8k.c
+++ b/bfd/cpu-z8k.c
@@ -23,142 +23,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 #include "libbfd.h"
 
-static const bfd_arch_info_type *compatible
-  PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
-
-#if 0				/* not used currently */
-/*
-Relocations for the Z8K
-
-*/
-static bfd_reloc_status_type
-howto16_callback (abfd, reloc_entry, symbol_in, data,
-		  ignore_input_section, ignore_bfd)
-     bfd *abfd;
-     arelent *reloc_entry;
-     struct bfd_symbol *symbol_in;
-     PTR data;
-     asection *ignore_input_section;
-     bfd *ignore_bfd;
-{
-  long relocation = 0;
-  bfd_vma addr = reloc_entry->address;
-  long x = bfd_get_16 (abfd, (bfd_byte *) data + addr);
-
-  HOWTO_PREPARE (relocation, symbol_in);
-
-  x = (x + relocation + reloc_entry->addend);
-
-  bfd_put_16 (abfd, x, (bfd_byte *) data + addr);
-  return bfd_reloc_ok;
-}
-
-static bfd_reloc_status_type
-howto8_callback (abfd, reloc_entry, symbol_in, data,
-		 ignore_input_section, ignore_bfd)
-     bfd *abfd;
-     arelent *reloc_entry;
-     struct bfd_symbol *symbol_in;
-     PTR data;
-     asection *ignore_input_section;
-     bfd *ignore_bfd;
-{
-  long relocation = 0;
-  bfd_vma addr = reloc_entry->address;
-  long x = bfd_get_8 (abfd, (bfd_byte *) data + addr);
-
-  HOWTO_PREPARE (relocation, symbol_in);
-
-  x = (x + relocation + reloc_entry->addend);
-
-  bfd_put_8 (abfd, x, (bfd_byte *) data + addr);
-  return bfd_reloc_ok;
-}
-
-static bfd_reloc_status_type
-howto8_FFnn_callback (abfd, reloc_entry, symbol_in, data,
-		      ignore_input_section, ignore_bfd)
-     bfd *abfd;
-     arelent *reloc_entry;
-     struct bfd_symbol *symbol_in;
-     PTR data;
-     asection *ignore_input_section;
-     bfd *ignore_bfd;
-{
-  long relocation = 0;
-  bfd_vma addr = reloc_entry->address;
-
-  long x = bfd_get_8 (abfd, (bfd_byte *) data + addr);
-  abort ();
-  HOWTO_PREPARE (relocation, symbol_in);
-
-  x = (x + relocation + reloc_entry->addend);
-
-  bfd_put_8 (abfd, x, (bfd_byte *) data + addr);
-  return bfd_reloc_ok;
-}
-
-static bfd_reloc_status_type
-howto8_pcrel_callback (abfd, reloc_entry, symbol_in, data,
-		       ignore_input_section, ignore_bfd)
-     bfd *abfd;
-     arelent *reloc_entry;
-     struct bfd_symbol *symbol_in;
-     PTR data;
-     asection *ignore_input_section;
-     bfd *ignore_bfd;
-{
-  long relocation = 0;
-  bfd_vma addr = reloc_entry->address;
-  long x = bfd_get_8 (abfd, (bfd_byte *) data + addr);
-  abort ();
-  HOWTO_PREPARE (relocation, symbol_in);
-
-  x = (x + relocation + reloc_entry->addend);
-
-  bfd_put_8 (abfd, x, (bfd_byte *) data + addr);
-  return bfd_reloc_ok;
-}
-
-static reloc_howto_type howto_16
-= NEWHOWTO (howto16_callback, "abs16", 1, FALSE, FALSE);
-static reloc_howto_type howto_8
-= NEWHOWTO (howto8_callback, "abs8", 0, FALSE, FALSE);
-
-static reloc_howto_type howto_8_FFnn
-= NEWHOWTO (howto8_FFnn_callback, "ff00+abs8", 0, FALSE, FALSE);
-
-static reloc_howto_type howto_8_pcrel
-= NEWHOWTO (howto8_pcrel_callback, "pcrel8", 0, FALSE, TRUE);
-
-static reloc_howto_type *
-local_bfd_reloc_type_lookup (arch, code)
-     const struct bfd_arch_info *arch;
-     bfd_reloc_code_real_type code;
-{
-  switch (code)
-    {
-    case BFD_RELOC_16:
-      return &howto_16;
-    case BFD_RELOC_8_FFnn:
-      return &howto_8_FFnn;
-    case BFD_RELOC_8:
-      return &howto_8;
-    case BFD_RELOC_8_PCREL:
-      return &howto_8_pcrel;
-    default:
-      return (reloc_howto_type *) NULL;
-    }
-}
-#endif
-
 /* This routine is provided two arch_infos and returns whether
    they'd be compatible */
 
 static const bfd_arch_info_type *
-compatible (a, b)
-     const bfd_arch_info_type *a;
-     const bfd_arch_info_type *b;
+compatible (const bfd_arch_info_type *a, const bfd_arch_info_type *b)
 {
   if (a->arch != b->arch || a->mach != b->mach)
     return NULL;