Remove old-style function definitions.

We already require -std=gnu99 and old-style function definitions might
hide some compiler warnings.

Signed-off-by: Mark Wielaard <mjw@redhat.com>

67 files changed, 114 insertions, 274 deletions

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 2e27ff96..cb5ec9ce 100644
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,7 @@
+2015-09-22  Mark Wielaard  <mjw@redhat.com>
+
+	* *.c: Remove old-style function definitions.
+
 2015-09-15  Mark Wielaard  <mjw@redhat.com>
 
 	* dwarf_peel_type.c (dwarf_peel_type): Don't reassign result pointer.
diff --git a/libdw/dwarf_abbrevhaschildren.c b/libdw/dwarf_abbrevhaschildren.c
index 4a83e31d..0f17c7ed 100644
--- a/libdw/dwarf_abbrevhaschildren.c
+++ b/libdw/dwarf_abbrevhaschildren.c
@@ -37,8 +37,7 @@
 
 
 int
-dwarf_abbrevhaschildren (abbrev)
-     Dwarf_Abbrev *abbrev;
+dwarf_abbrevhaschildren (Dwarf_Abbrev *abbrev)
 {
   return abbrev == NULL ? -1 : abbrev->has_children;
 }
diff --git a/libdw/dwarf_addrdie.c b/libdw/dwarf_addrdie.c
index 94eb1480..3a08ab75 100644
--- a/libdw/dwarf_addrdie.c
+++ b/libdw/dwarf_addrdie.c
@@ -35,10 +35,7 @@
 
 
 Dwarf_Die *
-dwarf_addrdie (dbg, addr, result)
-     Dwarf *dbg;
-     Dwarf_Addr addr;
-     Dwarf_Die *result;
+dwarf_addrdie (Dwarf *dbg, Dwarf_Addr addr, Dwarf_Die *result)
 {
   Dwarf_Aranges *aranges;
   size_t naranges;
diff --git a/libdw/dwarf_aggregate_size.c b/libdw/dwarf_aggregate_size.c
index 02478478..aaeb7ed9 100644
--- a/libdw/dwarf_aggregate_size.c
+++ b/libdw/dwarf_aggregate_size.c
@@ -230,9 +230,7 @@ aggregate_size (Dwarf_Die *die, Dwarf_Word *size, Dwarf_Die *type_mem)
 }
 
 int
-dwarf_aggregate_size (die, size)
-     Dwarf_Die *die;
-     Dwarf_Word *size;
+dwarf_aggregate_size (Dwarf_Die *die, Dwarf_Word *size)
 {
   Dwarf_Die type_mem;
 
diff --git a/libdw/dwarf_arrayorder.c b/libdw/dwarf_arrayorder.c
index 759fa4d8..da64f992 100644
--- a/libdw/dwarf_arrayorder.c
+++ b/libdw/dwarf_arrayorder.c
@@ -36,8 +36,7 @@
 
 
 int
-dwarf_arrayorder (die)
-     Dwarf_Die *die;
+dwarf_arrayorder (Dwarf_Die *die)
 {
   Dwarf_Attribute attr_mem;
   Dwarf_Word value;
diff --git a/libdw/dwarf_attr.c b/libdw/dwarf_attr.c
index f247c1af..db8acfe5 100644
--- a/libdw/dwarf_attr.c
+++ b/libdw/dwarf_attr.c
@@ -36,10 +36,7 @@
 
 
 Dwarf_Attribute *
-dwarf_attr (die, search_name, result)
-     Dwarf_Die *die;
-     unsigned int search_name;
-     Dwarf_Attribute *result;
+dwarf_attr (Dwarf_Die *die, unsigned int search_name, Dwarf_Attribute *result)
 {
   if (die == NULL)
     return NULL;
diff --git a/libdw/dwarf_begin.c b/libdw/dwarf_begin.c
index 9f3050fd..d04e5b9f 100644
--- a/libdw/dwarf_begin.c
+++ b/libdw/dwarf_begin.c
@@ -39,9 +39,7 @@
 
 
 Dwarf *
-dwarf_begin (fd, cmd)
-     int fd;
-     Dwarf_Cmd cmd;
+dwarf_begin (int fd, Dwarf_Cmd cmd)
 {
   Elf *elf;
   Elf_Cmd elfcmd;
diff --git a/libdw/dwarf_begin_elf.c b/libdw/dwarf_begin_elf.c
index 6d38946a..63532fd8 100644
--- a/libdw/dwarf_begin_elf.c
+++ b/libdw/dwarf_begin_elf.c
@@ -341,10 +341,7 @@ scngrp_read (Dwarf *result, Elf *elf, GElf_Ehdr *ehdr, Elf_Scn *scngrp)
 
 
 Dwarf *
-dwarf_begin_elf (elf, cmd, scngrp)
-     Elf *elf;
-     Dwarf_Cmd cmd;
-     Elf_Scn *scngrp;
+dwarf_begin_elf (Elf *elf, Dwarf_Cmd cmd, Elf_Scn *scngrp)
 {
   GElf_Ehdr *ehdr;
   GElf_Ehdr ehdr_mem;
diff --git a/libdw/dwarf_bitoffset.c b/libdw/dwarf_bitoffset.c
index 1648ecd7..c1a3a343 100644
--- a/libdw/dwarf_bitoffset.c
+++ b/libdw/dwarf_bitoffset.c
@@ -36,8 +36,7 @@
 
 
 int
-dwarf_bitoffset (die)
-     Dwarf_Die *die;
+dwarf_bitoffset (Dwarf_Die *die)
 {
   Dwarf_Attribute attr_mem;
   Dwarf_Word value;
diff --git a/libdw/dwarf_bitsize.c b/libdw/dwarf_bitsize.c
index ea9946b8..0ed9b710 100644
--- a/libdw/dwarf_bitsize.c
+++ b/libdw/dwarf_bitsize.c
@@ -36,8 +36,7 @@
 
 
 int
-dwarf_bitsize (die)
-     Dwarf_Die *die;
+dwarf_bitsize (Dwarf_Die *die)
 {
   Dwarf_Attribute attr_mem;
   Dwarf_Word value;
diff --git a/libdw/dwarf_bytesize.c b/libdw/dwarf_bytesize.c
index 6499a0ae..116cd321 100644
--- a/libdw/dwarf_bytesize.c
+++ b/libdw/dwarf_bytesize.c
@@ -36,8 +36,7 @@
 
 
 int
-dwarf_bytesize (die)
-     Dwarf_Die *die;
+dwarf_bytesize (Dwarf_Die *die)
 {
   Dwarf_Attribute attr_mem;
   Dwarf_Word value;
diff --git a/libdw/dwarf_cfi_addrframe.c b/libdw/dwarf_cfi_addrframe.c
index 1c0da03e..44240279 100644
--- a/libdw/dwarf_cfi_addrframe.c
+++ b/libdw/dwarf_cfi_addrframe.c
@@ -33,10 +33,7 @@
 #include "cfi.h"
 
 int
-dwarf_cfi_addrframe (cache, address, frame)
-     Dwarf_CFI *cache;
-     Dwarf_Addr address;
-     Dwarf_Frame **frame;
+dwarf_cfi_addrframe (Dwarf_CFI *cache, Dwarf_Addr address, Dwarf_Frame **frame)
 {
   /* Maybe there was a previous error.  */
   if (cache == NULL)
diff --git a/libdw/dwarf_cfi_end.c b/libdw/dwarf_cfi_end.c
index 6eb2ade8..d68e2db3 100644
--- a/libdw/dwarf_cfi_end.c
+++ b/libdw/dwarf_cfi_end.c
@@ -35,8 +35,7 @@
 #include <stdlib.h>
 
 int
-dwarf_cfi_end (cache)
-     Dwarf_CFI *cache;
+dwarf_cfi_end (Dwarf_CFI *cache)
 {
   if (cache != NULL)
     {
diff --git a/libdw/dwarf_child.c b/libdw/dwarf_child.c
index 58a438b5..cc95fb3f 100644
--- a/libdw/dwarf_child.c
+++ b/libdw/dwarf_child.c
@@ -115,9 +115,7 @@ __libdw_find_attr (Dwarf_Die *die, unsigned int search_name,
 
 
 int
-dwarf_child (die, result)
-     Dwarf_Die *die;
-     Dwarf_Die *result;
+dwarf_child (Dwarf_Die *die, Dwarf_Die *result)
 {
   /* Ignore previous errors.  */
   if (die == NULL)
diff --git a/libdw/dwarf_cu_die.c b/libdw/dwarf_cu_die.c
index 48f4176f..194da58b 100644
--- a/libdw/dwarf_cu_die.c
+++ b/libdw/dwarf_cu_die.c
@@ -35,16 +35,10 @@
 
 
 Dwarf_Die *
-dwarf_cu_die (cu, result, versionp, abbrev_offsetp, address_sizep,
-	      offset_sizep, type_signaturep, type_offsetp)
-    Dwarf_CU *cu;
-    Dwarf_Die *result;
-    Dwarf_Half *versionp;
-    Dwarf_Off *abbrev_offsetp;
-    uint8_t *address_sizep;
-    uint8_t *offset_sizep;
-    uint64_t *type_signaturep;
-    Dwarf_Off *type_offsetp;
+dwarf_cu_die (Dwarf_CU *cu, Dwarf_Die *result, Dwarf_Half *versionp,
+	      Dwarf_Off *abbrev_offsetp, uint8_t *address_sizep,
+	      uint8_t *offset_sizep, uint64_t *type_signaturep,
+	      Dwarf_Off *type_offsetp)
 {
   if (cu == NULL)
     return NULL;
diff --git a/libdw/dwarf_cu_getdwarf.c b/libdw/dwarf_cu_getdwarf.c
index f8a2e9b9..562460fe 100644
--- a/libdw/dwarf_cu_getdwarf.c
+++ b/libdw/dwarf_cu_getdwarf.c
@@ -36,8 +36,7 @@
 
 
 Dwarf *
-dwarf_cu_getdwarf (cu)
-     Dwarf_CU *cu;
+dwarf_cu_getdwarf (Dwarf_CU *cu)
 {
   if (cu == NULL)
     /* Some error occurred before.  */
diff --git a/libdw/dwarf_cuoffset.c b/libdw/dwarf_cuoffset.c
index 3ceffdb0..ba376486 100644
--- a/libdw/dwarf_cuoffset.c
+++ b/libdw/dwarf_cuoffset.c
@@ -36,8 +36,7 @@
 
 
 Dwarf_Off
-dwarf_cuoffset (die)
-     Dwarf_Die *die;
+dwarf_cuoffset (Dwarf_Die *die)
 {
   return (die == NULL
 	  ? (Dwarf_Off) -1l
diff --git a/libdw/dwarf_diecu.c b/libdw/dwarf_diecu.c
index bd9a37ae..5281c352 100644
--- a/libdw/dwarf_diecu.c
+++ b/libdw/dwarf_diecu.c
@@ -35,11 +35,8 @@
 
 
 Dwarf_Die *
-dwarf_diecu (die, result, address_sizep, offset_sizep)
-     Dwarf_Die *die;
-     Dwarf_Die *result;
-     uint8_t *address_sizep;
-     uint8_t *offset_sizep;
+dwarf_diecu (Dwarf_Die *die, Dwarf_Die *result, uint8_t *address_sizep,
+	     uint8_t *offset_sizep)
 {
   if (die == NULL)
     return NULL;
diff --git a/libdw/dwarf_diename.c b/libdw/dwarf_diename.c
index 050d8f1d..96450c1c 100644
--- a/libdw/dwarf_diename.c
+++ b/libdw/dwarf_diename.c
@@ -36,8 +36,7 @@
 
 
 const char *
-dwarf_diename (die)
-     Dwarf_Die *die;
+dwarf_diename (Dwarf_Die *die)
 {
   Dwarf_Attribute attr_mem;
 
diff --git a/libdw/dwarf_dieoffset.c b/libdw/dwarf_dieoffset.c
index 965b2c8d..8028f6dd 100644
--- a/libdw/dwarf_dieoffset.c
+++ b/libdw/dwarf_dieoffset.c
@@ -36,8 +36,7 @@
 
 
 Dwarf_Off
-dwarf_dieoffset (die)
-     Dwarf_Die *die;
+dwarf_dieoffset (Dwarf_Die *die)
 {
   return (die == NULL
 	  ? ~0ul
diff --git a/libdw/dwarf_end.c b/libdw/dwarf_end.c
index 922dc8f3..32b551df 100644
--- a/libdw/dwarf_end.c
+++ b/libdw/dwarf_end.c
@@ -76,8 +76,7 @@ __libdw_free_zdata (Dwarf *dwarf)
 #endif
 
 int
-dwarf_end (dwarf)
-     Dwarf *dwarf;
+dwarf_end (Dwarf *dwarf)
 {
   if (dwarf != NULL)
     {
diff --git a/libdw/dwarf_entry_breakpoints.c b/libdw/dwarf_entry_breakpoints.c
index ffd51697..abfee73c 100644
--- a/libdw/dwarf_entry_breakpoints.c
+++ b/libdw/dwarf_entry_breakpoints.c
@@ -35,9 +35,7 @@
 
 
 int
-dwarf_entry_breakpoints (die, bkpts)
-     Dwarf_Die *die;
-     Dwarf_Addr **bkpts;
+dwarf_entry_breakpoints (Dwarf_Die *die, Dwarf_Addr **bkpts)
 {
   int nbkpts = 0;
   *bkpts = NULL;
diff --git a/libdw/dwarf_entrypc.c b/libdw/dwarf_entrypc.c
index 8eb39dbc..0ef3b0ea 100644
--- a/libdw/dwarf_entrypc.c
+++ b/libdw/dwarf_entrypc.c
@@ -35,9 +35,7 @@
 
 
 int
-dwarf_entrypc (die, return_addr)
-     Dwarf_Die *die;
-     Dwarf_Addr *return_addr;
+dwarf_entrypc (Dwarf_Die *die, Dwarf_Addr *return_addr)
 {
   Dwarf_Attribute attr_mem;
 
diff --git a/libdw/dwarf_error.c b/libdw/dwarf_error.c
index fe389995..c431bd3e 100644
--- a/libdw/dwarf_error.c
+++ b/libdw/dwarf_error.c
@@ -100,8 +100,7 @@ static const char *errmsgs[] =
 
 
 void
-__libdw_seterrno (value)
-     int value;
+__libdw_seterrno (int value)
 {
   global_error = (value >= 0 && value < (int) nerrmsgs
 		  ? value : DWARF_E_UNKNOWN_ERROR);
@@ -109,8 +108,7 @@ __libdw_seterrno (value)
 
 
 const char *
-dwarf_errmsg (error)
-     int error;
+dwarf_errmsg (int error)
 {
   int last_error = global_error;
 
diff --git a/libdw/dwarf_formaddr.c b/libdw/dwarf_formaddr.c
index 9d4a3887..ddc48382 100644
--- a/libdw/dwarf_formaddr.c
+++ b/libdw/dwarf_formaddr.c
@@ -36,9 +36,7 @@
 
 
 int
-dwarf_formaddr (attr, return_addr)
-     Dwarf_Attribute *attr;
-     Dwarf_Addr *return_addr;
+dwarf_formaddr (Dwarf_Attribute *attr, Dwarf_Addr *return_addr)
 {
   if (attr == NULL)
     return -1;
diff --git a/libdw/dwarf_formblock.c b/libdw/dwarf_formblock.c
index 3d56f222..13f9e72a 100644
--- a/libdw/dwarf_formblock.c
+++ b/libdw/dwarf_formblock.c
@@ -36,9 +36,7 @@
 
 
 int
-dwarf_formblock (attr, return_block)
-     Dwarf_Attribute *attr;
-     Dwarf_Block *return_block;
+dwarf_formblock (Dwarf_Attribute *attr, Dwarf_Block *return_block)
 {
   if (attr == NULL)
     return -1;
diff --git a/libdw/dwarf_formflag.c b/libdw/dwarf_formflag.c
index bdc2267a..b48ede4e 100644
--- a/libdw/dwarf_formflag.c
+++ b/libdw/dwarf_formflag.c
@@ -36,9 +36,7 @@
 
 
 int
-dwarf_formflag (attr, return_bool)
-     Dwarf_Attribute *attr;
-     bool *return_bool;
+dwarf_formflag (Dwarf_Attribute *attr, bool *return_bool)
 {
   if (attr == NULL)
     return -1;
diff --git a/libdw/dwarf_formref.c b/libdw/dwarf_formref.c
index 25924371..c5fb19b1 100644
--- a/libdw/dwarf_formref.c
+++ b/libdw/dwarf_formref.c
@@ -35,9 +35,7 @@
 #include "libdwP.h"
 
 int
-__libdw_formref (attr, return_offset)
-     Dwarf_Attribute *attr;
-     Dwarf_Off *return_offset;
+__libdw_formref (Dwarf_Attribute *attr, Dwarf_Off *return_offset)
 {
   const unsigned char *datap = attr->valp;
   const unsigned char *endp = attr->cu->endp;
@@ -102,9 +100,7 @@ __libdw_formref (attr, return_offset)
 /* This is the old public entry point.
    It is now deprecated in favor of dwarf_formref_die.  */
 int
-dwarf_formref (attr, return_offset)
-     Dwarf_Attribute *attr;
-     Dwarf_Off *return_offset;
+dwarf_formref (Dwarf_Attribute *attr, Dwarf_Off *return_offset)
 {
   if (attr == NULL)
     return -1;
diff --git a/libdw/dwarf_formref_die.c b/libdw/dwarf_formref_die.c
index 8b92e22d..7e2b11a2 100644
--- a/libdw/dwarf_formref_die.c
+++ b/libdw/dwarf_formref_die.c
@@ -36,9 +36,7 @@
 
 
 Dwarf_Die *
-dwarf_formref_die (attr, result)
-     Dwarf_Attribute *attr;
-     Dwarf_Die *result;
+dwarf_formref_die (Dwarf_Attribute *attr, Dwarf_Die *result)
 {
   if (attr == NULL)
     return NULL;
diff --git a/libdw/dwarf_formsdata.c b/libdw/dwarf_formsdata.c
index 2380bf43..e7deaee1 100644
--- a/libdw/dwarf_formsdata.c
+++ b/libdw/dwarf_formsdata.c
@@ -36,9 +36,7 @@
 
 
 int
-dwarf_formsdata (attr, return_sval)
-     Dwarf_Attribute *attr;
-     Dwarf_Sword *return_sval;
+dwarf_formsdata (Dwarf_Attribute *attr, Dwarf_Sword *return_sval)
 {
   if (attr == NULL)
     return -1;
diff --git a/libdw/dwarf_formstring.c b/libdw/dwarf_formstring.c
index 02b56d4a..83abd53d 100644
--- a/libdw/dwarf_formstring.c
+++ b/libdw/dwarf_formstring.c
@@ -36,8 +36,7 @@
 
 
 const char *
-dwarf_formstring (attrp)
-     Dwarf_Attribute *attrp;
+dwarf_formstring (Dwarf_Attribute *attrp)
 {
   /* Ignore earlier errors.  */
   if (attrp == NULL)
diff --git a/libdw/dwarf_formudata.c b/libdw/dwarf_formudata.c
index a01ff312..e41981a4 100644
--- a/libdw/dwarf_formudata.c
+++ b/libdw/dwarf_formudata.c
@@ -94,9 +94,7 @@ __libdw_formptr (Dwarf_Attribute *attr, int sec_index,
 }
 
 int
-dwarf_formudata (attr, return_uval)
-     Dwarf_Attribute *attr;
-     Dwarf_Word *return_uval;
+dwarf_formudata (Dwarf_Attribute *attr, Dwarf_Word *return_uval)
 {
   if (attr == NULL)
     return -1;
diff --git a/libdw/dwarf_frame_cfa.c b/libdw/dwarf_frame_cfa.c
index a9ae7e73..07f998cd 100644
--- a/libdw/dwarf_frame_cfa.c
+++ b/libdw/dwarf_frame_cfa.c
@@ -35,10 +35,7 @@
 #include <stdlib.h>
 
 int
-dwarf_frame_cfa (fs, ops, nops)
-     Dwarf_Frame *fs;
-     Dwarf_Op **ops;
-     size_t *nops;
+dwarf_frame_cfa (Dwarf_Frame *fs, Dwarf_Op **ops, size_t *nops)
 {
   /* Maybe there was a previous error.  */
   if (fs == NULL)
diff --git a/libdw/dwarf_frame_info.c b/libdw/dwarf_frame_info.c
index 7da46fb0..9ba560fc 100644
--- a/libdw/dwarf_frame_info.c
+++ b/libdw/dwarf_frame_info.c
@@ -33,11 +33,8 @@
 #include "cfi.h"
 
 int
-dwarf_frame_info (fs, start, end, signalp)
-     Dwarf_Frame *fs;
-     Dwarf_Addr *start;
-     Dwarf_Addr *end;
-     bool *signalp;
+dwarf_frame_info (Dwarf_Frame *fs, Dwarf_Addr *start, Dwarf_Addr *end,
+		  bool *signalp)
 {
   /* Maybe there was a previous error.  */
   if (fs == NULL)
diff --git a/libdw/dwarf_frame_register.c b/libdw/dwarf_frame_register.c
index 10d2fe49..37e8e917 100644
--- a/libdw/dwarf_frame_register.c
+++ b/libdw/dwarf_frame_register.c
@@ -34,12 +34,8 @@
 #include <dwarf.h>
 
 int
-dwarf_frame_register (fs, regno, ops_mem, ops, nops)
-     Dwarf_Frame *fs;
-     int regno;
-     Dwarf_Op ops_mem[3];
-     Dwarf_Op **ops;
-     size_t *nops;
+dwarf_frame_register (Dwarf_Frame *fs, int regno, Dwarf_Op *ops_mem,
+		      Dwarf_Op **ops, size_t *nops)
 {
   /* Maybe there was a previous error.  */
   if (fs == NULL)
diff --git a/libdw/dwarf_getabbrev.c b/libdw/dwarf_getabbrev.c
index 0efde45b..ef51b847 100644
--- a/libdw/dwarf_getabbrev.c
+++ b/libdw/dwarf_getabbrev.c
@@ -37,12 +37,8 @@
 
 Dwarf_Abbrev *
 internal_function
-__libdw_getabbrev (dbg, cu, offset, lengthp, result)
-     Dwarf *dbg;
-     struct Dwarf_CU *cu;
-     Dwarf_Off offset;
-     size_t *lengthp;
-     Dwarf_Abbrev *result;
+__libdw_getabbrev (Dwarf *dbg, struct Dwarf_CU *cu, Dwarf_Off offset,
+		   size_t *lengthp, Dwarf_Abbrev *result)
 {
   /* Don't fail if there is not .debug_abbrev section.  */
   if (dbg->sectiondata[IDX_debug_abbrev] == NULL)
@@ -154,10 +150,7 @@ __libdw_getabbrev (dbg, cu, offset, lengthp, result)
 
 
 Dwarf_Abbrev *
-dwarf_getabbrev (die, offset, lengthp)
-     Dwarf_Die *die;
-     Dwarf_Off offset;
-     size_t *lengthp;
+dwarf_getabbrev (Dwarf_Die *die, Dwarf_Off offset, size_t *lengthp)
 {
   return __libdw_getabbrev (die->cu->dbg, die->cu,
 			    die->cu->orig_abbrev_offset + offset, lengthp,
diff --git a/libdw/dwarf_getabbrevattr.c b/libdw/dwarf_getabbrevattr.c
index 574467ce..3b4da99c 100644
--- a/libdw/dwarf_getabbrevattr.c
+++ b/libdw/dwarf_getabbrevattr.c
@@ -37,12 +37,8 @@
 
 
 int
-dwarf_getabbrevattr (abbrev, idx, namep, formp, offsetp)
-     Dwarf_Abbrev *abbrev;
-     size_t idx;
-     unsigned int *namep;
-     unsigned int *formp;
-     Dwarf_Off *offsetp;
+dwarf_getabbrevattr (Dwarf_Abbrev *abbrev, size_t idx, unsigned int *namep,
+		     unsigned int *formp, Dwarf_Off *offsetp)
 {
   if (abbrev == NULL)
     return -1;
diff --git a/libdw/dwarf_getabbrevcode.c b/libdw/dwarf_getabbrevcode.c
index 0df90649..86917084 100644
--- a/libdw/dwarf_getabbrevcode.c
+++ b/libdw/dwarf_getabbrevcode.c
@@ -37,8 +37,7 @@
 
 
 unsigned int
-dwarf_getabbrevcode (abbrev)
-     Dwarf_Abbrev *abbrev;
+dwarf_getabbrevcode (Dwarf_Abbrev *abbrev)
 {
   return abbrev == NULL ? 0 : abbrev->code;
 }
diff --git a/libdw/dwarf_getabbrevtag.c b/libdw/dwarf_getabbrevtag.c
index 36a5262d..52aaa3f3 100644
--- a/libdw/dwarf_getabbrevtag.c
+++ b/libdw/dwarf_getabbrevtag.c
@@ -37,8 +37,7 @@
 
 
 unsigned int
-dwarf_getabbrevtag (abbrev)
-     Dwarf_Abbrev *abbrev;
+dwarf_getabbrevtag (Dwarf_Abbrev *abbrev)
 {
   return abbrev == NULL ? 0 : abbrev->tag;
 }
diff --git a/libdw/dwarf_getarange_addr.c b/libdw/dwarf_getarange_addr.c
index fc143de9..d383e228 100644
--- a/libdw/dwarf_getarange_addr.c
+++ b/libdw/dwarf_getarange_addr.c
@@ -35,9 +35,7 @@
 
 
 Dwarf_Arange *
-dwarf_getarange_addr (aranges, addr)
-     Dwarf_Aranges *aranges;
-     Dwarf_Addr addr;
+dwarf_getarange_addr (Dwarf_Aranges *aranges, Dwarf_Addr addr)
 {
   if (aranges == NULL)
     return NULL;
diff --git a/libdw/dwarf_getaranges.c b/libdw/dwarf_getaranges.c
index 6c6169e9..4252746e 100644
--- a/libdw/dwarf_getaranges.c
+++ b/libdw/dwarf_getaranges.c
@@ -54,10 +54,7 @@ compare_aranges (const void *a, const void *b)
 }
 
 int
-dwarf_getaranges (dbg, aranges, naranges)
-     Dwarf *dbg;
-     Dwarf_Aranges **aranges;
-     size_t *naranges;
+dwarf_getaranges (Dwarf *dbg, Dwarf_Aranges **aranges, size_t *naranges)
 {
   if (dbg == NULL)
     return -1;
diff --git a/libdw/dwarf_getattrcnt.c b/libdw/dwarf_getattrcnt.c
index 72be766e..2bfb4ac5 100644
--- a/libdw/dwarf_getattrcnt.c
+++ b/libdw/dwarf_getattrcnt.c
@@ -35,9 +35,7 @@
 
 
 int
-dwarf_getattrcnt (abbrev, attrcntp)
-     Dwarf_Abbrev *abbrev;
-     size_t *attrcntp;
+dwarf_getattrcnt (Dwarf_Abbrev *abbrev, size_t *attrcntp)
 {
   if (abbrev == NULL)
     return -1;
diff --git a/libdw/dwarf_getcfi.c b/libdw/dwarf_getcfi.c
index a49a9f06..9aed403e 100644
--- a/libdw/dwarf_getcfi.c
+++ b/libdw/dwarf_getcfi.c
@@ -35,8 +35,7 @@
 #include <dwarf.h>
 
 Dwarf_CFI *
-dwarf_getcfi (dbg)
-     Dwarf *dbg;
+dwarf_getcfi (Dwarf *dbg)
 {
   if (dbg == NULL)
     return NULL;
diff --git a/libdw/dwarf_getcfi_elf.c b/libdw/dwarf_getcfi_elf.c
index 3e611f8f..315cc02f 100644
--- a/libdw/dwarf_getcfi_elf.c
+++ b/libdw/dwarf_getcfi_elf.c
@@ -311,8 +311,7 @@ getcfi_shdr (Elf *elf, const GElf_Ehdr *ehdr)
 }
 
 Dwarf_CFI *
-dwarf_getcfi_elf (elf)
-     Elf *elf;
+dwarf_getcfi_elf (Elf *elf)
 {
   if (elf_kind (elf) != ELF_K_ELF)
     {
diff --git a/libdw/dwarf_getelf.c b/libdw/dwarf_getelf.c
index ecd18592..2d6268ea 100644
--- a/libdw/dwarf_getelf.c
+++ b/libdw/dwarf_getelf.c
@@ -37,8 +37,7 @@
 
 
 Elf *
-dwarf_getelf (dwarf)
-     Dwarf *dwarf;
+dwarf_getelf (Dwarf *dwarf)
 {
   if (dwarf == NULL)
     /* Some error occurred before.  */
diff --git a/libdw/dwarf_getlocation.c b/libdw/dwarf_getlocation.c
index 0a0e04b4..a4a2761e 100644
--- a/libdw/dwarf_getlocation.c
+++ b/libdw/dwarf_getlocation.c
@@ -113,10 +113,8 @@ store_implicit_value (Dwarf *dbg, void **cache, Dwarf_Op *op)
 }
 
 int
-dwarf_getlocation_implicit_value (attr, op, return_block)
-     Dwarf_Attribute *attr;
-     const Dwarf_Op *op;
-     Dwarf_Block *return_block;
+dwarf_getlocation_implicit_value (Dwarf_Attribute *attr, const Dwarf_Op *op,
+				  Dwarf_Block *return_block)
 {
   if (attr == NULL)
     return -1;
@@ -609,10 +607,7 @@ getlocation (struct Dwarf_CU *cu, const Dwarf_Block *block,
 }
 
 int
-dwarf_getlocation (attr, llbuf, listlen)
-     Dwarf_Attribute *attr;
-     Dwarf_Op **llbuf;
-     size_t *listlen;
+dwarf_getlocation (Dwarf_Attribute *attr, Dwarf_Op **llbuf, size_t *listlen)
 {
   if (! attr_ok (attr))
     return -1;
@@ -630,9 +625,7 @@ dwarf_getlocation (attr, llbuf, listlen)
 }
 
 static int
-attr_base_address (attr, basep)
-     Dwarf_Attribute *attr;
-     Dwarf_Addr *basep;
+attr_base_address (Dwarf_Attribute *attr, Dwarf_Addr *basep)
 {
   /* Fetch the CU's base address.  */
   Dwarf_Die cudie = CUDIE (attr->cu);
@@ -661,10 +654,8 @@ attr_base_address (attr, basep)
 }
 
 static int
-initial_offset_base (attr, offset, basep)
-     Dwarf_Attribute *attr;
-     ptrdiff_t *offset;
-     Dwarf_Addr *basep;
+initial_offset_base (Dwarf_Attribute *attr, ptrdiff_t *offset,
+		     Dwarf_Addr *basep)
 {
   if (attr_base_address (attr, basep) != 0)
     return -1;
@@ -738,12 +729,8 @@ getlocations_addr (Dwarf_Attribute *attr, ptrdiff_t offset,
 }
 
 int
-dwarf_getlocation_addr (attr, address, llbufs, listlens, maxlocs)
-     Dwarf_Attribute *attr;
-     Dwarf_Addr address;
-     Dwarf_Op **llbufs;
-     size_t *listlens;
-     size_t maxlocs;
+dwarf_getlocation_addr (Dwarf_Attribute *attr, Dwarf_Addr address,
+			Dwarf_Op **llbufs, size_t *listlens, size_t maxlocs)
 {
   if (! attr_ok (attr))
     return -1;
@@ -813,14 +800,9 @@ dwarf_getlocation_addr (attr, address, llbufs, listlens, maxlocs)
 }
 
 ptrdiff_t
-dwarf_getlocations (attr, offset, basep, startp, endp, expr, exprlen)
-     Dwarf_Attribute *attr;
-     ptrdiff_t offset;
-     Dwarf_Addr *basep;
-     Dwarf_Addr *startp;
-     Dwarf_Addr *endp;
-     Dwarf_Op **expr;
-     size_t *exprlen;
+dwarf_getlocations (Dwarf_Attribute *attr, ptrdiff_t offset, Dwarf_Addr *basep,
+		    Dwarf_Addr *startp, Dwarf_Addr *endp, Dwarf_Op **expr,
+		    size_t *exprlen)
 {
   if (! attr_ok (attr))
     return -1;
diff --git a/libdw/dwarf_getlocation_attr.c b/libdw/dwarf_getlocation_attr.c
index 3229baf6..8b6a4afd 100644
--- a/libdw/dwarf_getlocation_attr.c
+++ b/libdw/dwarf_getlocation_attr.c
@@ -53,10 +53,7 @@ attr_form_cu (Dwarf_Attribute *attr)
 }
 
 int
-dwarf_getlocation_attr (attr, op, result)
-     Dwarf_Attribute *attr;
-     const Dwarf_Op *op;
-     Dwarf_Attribute *result;
+dwarf_getlocation_attr (Dwarf_Attribute *attr, const Dwarf_Op *op, Dwarf_Attribute *result)
 {
   if (attr == NULL)
     return -1;
diff --git a/libdw/dwarf_getlocation_die.c b/libdw/dwarf_getlocation_die.c
index fa03aac2..b4908d2b 100644
--- a/libdw/dwarf_getlocation_die.c
+++ b/libdw/dwarf_getlocation_die.c
@@ -34,10 +34,8 @@
 #include <libdwP.h>
 
 int
-dwarf_getlocation_die (attr, op, result)
-     Dwarf_Attribute *attr;
-     const Dwarf_Op *op;
-     Dwarf_Die *result;
+dwarf_getlocation_die (Dwarf_Attribute *attr, const Dwarf_Op *op,
+		       Dwarf_Die *result)
 {
   if (attr == NULL)
     return -1;
diff --git a/libdw/dwarf_getlocation_implicit_pointer.c b/libdw/dwarf_getlocation_implicit_pointer.c
index f1c16be7..95053820 100644
--- a/libdw/dwarf_getlocation_implicit_pointer.c
+++ b/libdw/dwarf_getlocation_implicit_pointer.c
@@ -49,10 +49,8 @@ __libdw_empty_loc_attr (Dwarf_Attribute *attr)
 }
 
 int
-dwarf_getlocation_implicit_pointer (attr, op, result)
-     Dwarf_Attribute *attr;
-     const Dwarf_Op *op;
-     Dwarf_Attribute *result;
+dwarf_getlocation_implicit_pointer (Dwarf_Attribute *attr, const Dwarf_Op *op,
+				    Dwarf_Attribute *result)
 {
   if (attr == NULL)
     return -1;
diff --git a/libdw/dwarf_getmacros.c b/libdw/dwarf_getmacros.c
index a326e586..eb505085 100644
--- a/libdw/dwarf_getmacros.c
+++ b/libdw/dwarf_getmacros.c
@@ -511,11 +511,8 @@ dwarf_getmacros_off (Dwarf *dbg, Dwarf_Off macoff,
 }
 
 ptrdiff_t
-dwarf_getmacros (cudie, callback, arg, token)
-     Dwarf_Die *cudie;
-     int (*callback) (Dwarf_Macro *, void *);
-     void *arg;
-     ptrdiff_t token;
+dwarf_getmacros (Dwarf_Die *cudie, int (*callback) (Dwarf_Macro *, void *),
+		 void *arg, ptrdiff_t token)
 {
   if (cudie == NULL)
     {
diff --git a/libdw/dwarf_getpubnames.c b/libdw/dwarf_getpubnames.c
index 41b2407b..462b6ff0 100644
--- a/libdw/dwarf_getpubnames.c
+++ b/libdw/dwarf_getpubnames.c
@@ -140,11 +140,9 @@ get_offsets (Dwarf *dbg)
 
 
 ptrdiff_t
-dwarf_getpubnames (dbg, callback, arg, offset)
-     Dwarf *dbg;
-     int (*callback) (Dwarf *, Dwarf_Global *, void *);
-     void *arg;
-     ptrdiff_t offset;
+dwarf_getpubnames (Dwarf *dbg,
+		   int (*callback) (Dwarf *, Dwarf_Global *, void *),
+		   void *arg, ptrdiff_t offset)
 {
   if (dbg == NULL)
     return -1l;
diff --git a/libdw/dwarf_getsrcdirs.c b/libdw/dwarf_getsrcdirs.c
index 47283ec2..8160ed30 100644
--- a/libdw/dwarf_getsrcdirs.c
+++ b/libdw/dwarf_getsrcdirs.c
@@ -34,10 +34,7 @@
 
 
 int
-dwarf_getsrcdirs (files, result, ndirs)
-     Dwarf_Files *files;
-     const char *const **result;
-     size_t *ndirs;
+dwarf_getsrcdirs (Dwarf_Files *files, const char *const **result, size_t *ndirs)
 {
   if (files == NULL)
     return -1;
diff --git a/libdw/dwarf_getstring.c b/libdw/dwarf_getstring.c
index 672bb27e..5620cb07 100644
--- a/libdw/dwarf_getstring.c
+++ b/libdw/dwarf_getstring.c
@@ -36,10 +36,7 @@
 
 
 const char *
-dwarf_getstring (dbg, offset, lenp)
-     Dwarf *dbg;
-     Dwarf_Off offset;
-     size_t *lenp;
+dwarf_getstring (Dwarf *dbg, Dwarf_Off offset, size_t *lenp)
 {
   if (dbg == NULL)
     return NULL;
diff --git a/libdw/dwarf_hasattr.c b/libdw/dwarf_hasattr.c
index 812c09bc..2bb8dc82 100644
--- a/libdw/dwarf_hasattr.c
+++ b/libdw/dwarf_hasattr.c
@@ -36,9 +36,7 @@
 
 
 int
-dwarf_hasattr (die, search_name)
-     Dwarf_Die *die;
-     unsigned int search_name;
+dwarf_hasattr (Dwarf_Die *die, unsigned int search_name)
 {
   if (die == NULL)
     return 0;
diff --git a/libdw/dwarf_haschildren.c b/libdw/dwarf_haschildren.c
index d0ce51ea..03a81737 100644
--- a/libdw/dwarf_haschildren.c
+++ b/libdw/dwarf_haschildren.c
@@ -36,8 +36,7 @@
 
 
 int
-dwarf_haschildren (die)
-     Dwarf_Die *die;
+dwarf_haschildren (Dwarf_Die *die)
 {
   /* Find the abbreviation entry.  */
   Dwarf_Abbrev *abbrevp = __libdw_dieabbrev (die, NULL);
diff --git a/libdw/dwarf_hasform.c b/libdw/dwarf_hasform.c
index a95ca9ea..a0c32298 100644
--- a/libdw/dwarf_hasform.c
+++ b/libdw/dwarf_hasform.c
@@ -36,9 +36,7 @@
 
 
 int
-dwarf_hasform (attr, search_form)
-     Dwarf_Attribute *attr;
-     unsigned int search_form;
+dwarf_hasform (Dwarf_Attribute *attr, unsigned int search_form)
 {
   if (attr == NULL)
     return 0;
diff --git a/libdw/dwarf_highpc.c b/libdw/dwarf_highpc.c
index 8bf93f03..20702545 100644
--- a/libdw/dwarf_highpc.c
+++ b/libdw/dwarf_highpc.c
@@ -36,9 +36,7 @@
 
 
 int
-dwarf_highpc (die, return_addr)
-     Dwarf_Die *die;
-     Dwarf_Addr *return_addr;
+dwarf_highpc (Dwarf_Die *die, Dwarf_Addr *return_addr)
 {
   Dwarf_Attribute attr_high_mem;
   Dwarf_Attribute *attr_high = INTUSE(dwarf_attr) (die, DW_AT_high_pc,
diff --git a/libdw/dwarf_lowpc.c b/libdw/dwarf_lowpc.c
index 4677aed8..b3be2b0e 100644
--- a/libdw/dwarf_lowpc.c
+++ b/libdw/dwarf_lowpc.c
@@ -36,9 +36,7 @@
 
 
 int
-dwarf_lowpc (die, return_addr)
-     Dwarf_Die *die;
-     Dwarf_Addr *return_addr;
+dwarf_lowpc (Dwarf_Die *die, Dwarf_Addr *return_addr)
 {
   Dwarf_Attribute attr_mem;
 
diff --git a/libdw/dwarf_nextcu.c b/libdw/dwarf_nextcu.c
index 875d8694..fa9b0af3 100644
--- a/libdw/dwarf_nextcu.c
+++ b/libdw/dwarf_nextcu.c
@@ -36,18 +36,11 @@
 
 
 int
-dwarf_next_unit (dwarf, off, next_off, header_sizep, versionp, abbrev_offsetp,
-		 address_sizep, offset_sizep, type_signaturep, type_offsetp)
-     Dwarf *dwarf;
-     Dwarf_Off off;
-     Dwarf_Off *next_off;
-     size_t *header_sizep;
-     Dwarf_Half *versionp;
-     Dwarf_Off *abbrev_offsetp;
-     uint8_t *address_sizep;
-     uint8_t *offset_sizep;
-     uint64_t *type_signaturep;
-     Dwarf_Off *type_offsetp;
+dwarf_next_unit (Dwarf *dwarf, Dwarf_Off off, Dwarf_Off *next_off,
+		 size_t *header_sizep, Dwarf_Half *versionp,
+		 Dwarf_Off *abbrev_offsetp, uint8_t *address_sizep,
+		 uint8_t *offset_sizep, uint64_t *type_signaturep,
+		 Dwarf_Off *type_offsetp)
 {
   const bool debug_types = type_signaturep != NULL;
   const size_t sec_idx = debug_types ? IDX_debug_types : IDX_debug_info;
@@ -182,15 +175,9 @@ dwarf_next_unit (dwarf, off, next_off, header_sizep, versionp, abbrev_offsetp,
 INTDEF(dwarf_next_unit)
 
 int
-dwarf_nextcu (dwarf, off, next_off, header_sizep, abbrev_offsetp,
-	      address_sizep, offset_sizep)
-     Dwarf *dwarf;
-     Dwarf_Off off;
-     Dwarf_Off *next_off;
-     size_t *header_sizep;
-     Dwarf_Off *abbrev_offsetp;
-     uint8_t *address_sizep;
-     uint8_t *offset_sizep;
+dwarf_nextcu (Dwarf *dwarf, Dwarf_Off off, Dwarf_Off *next_off,
+	      size_t *header_sizep, Dwarf_Off *abbrev_offsetp,
+	      uint8_t *address_sizep, uint8_t *offset_sizep)
 {
   return INTUSE(dwarf_next_unit) (dwarf, off, next_off, header_sizep, NULL,
 				  abbrev_offsetp, address_sizep, offset_sizep,
diff --git a/libdw/dwarf_offdie.c b/libdw/dwarf_offdie.c
index b5dd405d..15f55c22 100644
--- a/libdw/dwarf_offdie.c
+++ b/libdw/dwarf_offdie.c
@@ -71,20 +71,14 @@ __libdw_offdie (Dwarf *dbg, Dwarf_Off offset, Dwarf_Die *result,
 
 
 Dwarf_Die *
-dwarf_offdie (dbg, offset, result)
-     Dwarf *dbg;
-     Dwarf_Off offset;
-     Dwarf_Die *result;
+dwarf_offdie (Dwarf *dbg, Dwarf_Off offset, Dwarf_Die *result)
 {
   return __libdw_offdie (dbg, offset, result, false);
 }
 INTDEF(dwarf_offdie)
 
 Dwarf_Die *
-dwarf_offdie_types (dbg, offset, result)
-     Dwarf *dbg;
-     Dwarf_Off offset;
-     Dwarf_Die *result;
+dwarf_offdie_types (Dwarf *dbg, Dwarf_Off offset, Dwarf_Die *result)
 {
   return __libdw_offdie (dbg, offset, result, true);
 }
diff --git a/libdw/dwarf_peel_type.c b/libdw/dwarf_peel_type.c
index 7b29d35a..5dca8f88 100644
--- a/libdw/dwarf_peel_type.c
+++ b/libdw/dwarf_peel_type.c
@@ -36,9 +36,7 @@
 
 
 int
-dwarf_peel_type (die, result)
-     Dwarf_Die *die;
-     Dwarf_Die *result;
+dwarf_peel_type (Dwarf_Die *die, Dwarf_Die *result)
 {
   int tag;
 
diff --git a/libdw/dwarf_siblingof.c b/libdw/dwarf_siblingof.c
index 0dafc179..df39c1cb 100644
--- a/libdw/dwarf_siblingof.c
+++ b/libdw/dwarf_siblingof.c
@@ -37,9 +37,7 @@
 
 
 int
-dwarf_siblingof (die, result)
-     Dwarf_Die *die;
-     Dwarf_Die *result;
+dwarf_siblingof (Dwarf_Die *die, Dwarf_Die *result)
 {
   /* Ignore previous errors.  */
   if (die == NULL)
diff --git a/libdw/dwarf_srclang.c b/libdw/dwarf_srclang.c
index 6cc06ffb..f10e7642 100644
--- a/libdw/dwarf_srclang.c
+++ b/libdw/dwarf_srclang.c
@@ -36,8 +36,7 @@
 
 
 int
-dwarf_srclang (die)
-     Dwarf_Die *die;
+dwarf_srclang (Dwarf_Die *die)
 {
   Dwarf_Attribute attr_mem;
   Dwarf_Word value;
diff --git a/libdw/dwarf_tag.c b/libdw/dwarf_tag.c
index 0b1a4b08..331eaa0d 100644
--- a/libdw/dwarf_tag.c
+++ b/libdw/dwarf_tag.c
@@ -79,8 +79,7 @@ __libdw_findabbrev (struct Dwarf_CU *cu, unsigned int code)
 
 
 int
-dwarf_tag (die)
-     Dwarf_Die *die;
+dwarf_tag (Dwarf_Die *die)
 {
   /* Find the abbreviation entry.  */
   Dwarf_Abbrev *abbrevp = __libdw_dieabbrev (die, NULL);
diff --git a/libdw/dwarf_whatattr.c b/libdw/dwarf_whatattr.c
index 8fe5535b..d664b021 100644
--- a/libdw/dwarf_whatattr.c
+++ b/libdw/dwarf_whatattr.c
@@ -36,8 +36,7 @@
 
 
 unsigned int
-dwarf_whatattr (attr)
-     Dwarf_Attribute *attr;
+dwarf_whatattr (Dwarf_Attribute *attr)
 {
   return attr == NULL ? 0 : attr->code;
 }
diff --git a/libdw/dwarf_whatform.c b/libdw/dwarf_whatform.c
index 1d0d14b0..dee29a9f 100644
--- a/libdw/dwarf_whatform.c
+++ b/libdw/dwarf_whatform.c
@@ -36,8 +36,7 @@
 
 
 unsigned int
-dwarf_whatform (attr)
-     Dwarf_Attribute *attr;
+dwarf_whatform (Dwarf_Attribute *attr)
 {
   return attr == NULL ? 0 : attr->form;
 }
diff --git a/libdw/libdw_visit_scopes.c b/libdw/libdw_visit_scopes.c
index d0b5134d..c882e4a5 100644
--- a/libdw/libdw_visit_scopes.c
+++ b/libdw/libdw_visit_scopes.c
@@ -65,13 +65,15 @@ may_have_scopes (Dwarf_Die *die)
 }
 
 int
-__libdw_visit_scopes (depth, root, imports, previsit, postvisit, arg)
-     unsigned int depth;
-     struct Dwarf_Die_Chain *root;
-     struct Dwarf_Die_Chain *imports;
-     int (*previsit) (unsigned int depth, struct Dwarf_Die_Chain *, void *);
-     int (*postvisit) (unsigned int depth, struct Dwarf_Die_Chain *, void *);
-     void *arg;
+__libdw_visit_scopes (unsigned int depth, struct Dwarf_Die_Chain *root,
+		      struct Dwarf_Die_Chain *imports,
+		      int (*previsit) (unsigned int,
+				       struct Dwarf_Die_Chain *,
+				       void *),
+		      int (*postvisit) (unsigned int,
+					struct Dwarf_Die_Chain *,
+					void *),
+		      void *arg)
 {
   struct Dwarf_Die_Chain child;
   int ret;
@@ -97,8 +99,8 @@ __libdw_visit_scopes (depth, root, imports, previsit, postvisit, arg)
     return false;
   }
 
-  inline int walk_children ()
-  {
+  inline int walk_children (void)
+{
     do
       {
 	/* For an imported unit, it is logically as if the children of