Cosmetic, get rid of defining several variables per line

diff --git a/libdw/dwarf_getlocation.c b/libdw/dwarf_getlocation.c
index 8092ecedae002d562a5bfd4967afc177d26b4982..f829e72b114921567235a3550f2d803f8f45df85 100644 (file)
--- a/libdw/dwarf_getlocation.c
+++ b/libdw/dwarf_getlocation.c
@@ -378,8 +378,9 @@ dwarf_getlocation_addr (attr, address, llbufs, listlens, maxlocs)
       return -1;
     }
 
-  unsigned char *endp, *readp
-    = __libdw_formptr (attr, IDX_debug_loc, DWARF_E_NO_LOCLIST, &endp, NULL);
+  unsigned char *endp;
+  unsigned char *readp = __libdw_formptr (attr, IDX_debug_loc,
+                                         DWARF_E_NO_LOCLIST, &endp, NULL);
   if (readp == NULL)
     return -1;
 

diff --git a/libdw/dwarf_getsrclines.c b/libdw/dwarf_getsrclines.c
index 2158f2687159f594e4ef65ade8500d0b6e15306e..efd0459f59bfe2fcfb5e47ca3525acc5d27acfa5 100644 (file)
--- a/libdw/dwarf_getsrclines.c
+++ b/libdw/dwarf_getsrclines.c
@@ -135,7 +135,8 @@ dwarf_getsrclines (Dwarf_Die *cudie, Dwarf_Lines **lines, size_t *nlines)
 
       /* Get the offset into the .debug_line section.  NB: this call
         also checks whether the previous dwarf_attr call failed.  */
-      const unsigned char *lineendp, *linep
+      const unsigned char *lineendp;
+      const unsigned char *linep
        = __libdw_formptr (stmt_list, IDX_debug_line, DWARF_E_NO_DEBUG_LINE,
                           (unsigned char **) &lineendp, NULL);
       if (linep == NULL)

diff --git a/libdw/dwarf_ranges.c b/libdw/dwarf_ranges.c
index eff9ce4d65436d693f83c575eb5f829ea55e9471..50fb6ba2ddc4a57ca212bd5549bc8e00c796437c 100644 (file)
--- a/libdw/dwarf_ranges.c
+++ b/libdw/dwarf_ranges.c
@@ -66,9 +66,10 @@ __libdw_read_begin_end_pair_inc (Dwarf *dbg, int sec_index,
                                 Dwarf_Addr *beginp, Dwarf_Addr *endp,
                                 Dwarf_Addr *basep)
 {
-  Dwarf_Addr escape
-    = width == 8 ? (Elf64_Addr) -1 : (Elf64_Addr) (Elf32_Addr) -1;
-  Dwarf_Addr begin, end;
+  Dwarf_Addr escape = (width == 8 ? (Elf64_Addr) -1
+                      : (Elf64_Addr) (Elf32_Addr) -1);
+  Dwarf_Addr begin;
+  Dwarf_Addr end;
 
   unsigned char *addr = *addrp;
   bool begin_relocated = READ_AND_RELOCATE (__libdw_relocate_address, begin);
@@ -129,7 +130,8 @@ dwarf_ranges (Dwarf_Die *die, ptrdiff_t offset, Dwarf_Addr *basep,
       return -1;
     }
 
-  unsigned char *readp, *readendp;
+  unsigned char *readp;
+  unsigned char *readendp;
   if (offset == 0)
     {
       Dwarf_Attribute attr_mem;