Minimal cleanups after merge.

diff --git a/libdw/dwarf_diecu.c b/libdw/dwarf_diecu.c
index 963c7d06ab52b3ff37e0807b17e73dddcea88cdd..f5665ec97f1c241c896bce2f811d682dce1d5495 100644 (file)
--- a/libdw/dwarf_diecu.c
+++ b/libdw/dwarf_diecu.c
@@ -70,7 +70,8 @@ dwarf_diecu (die, result, address_sizep, offset_sizep)
   memset (result, '\0', sizeof (Dwarf_Die));
 
   result->addr = ((char *) die->cu->dbg->sectiondata[IDX_debug_info]->d_buf
-                 + DIE_OFFSET_FROM_CU_OFFSET (die->cu->start, die->cu->offset_size));
+                 + DIE_OFFSET_FROM_CU_OFFSET (die->cu->start,
+                                              die->cu->offset_size));
   result->cu = die->cu;
 
   if (address_sizep != NULL)

diff --git a/libdw/dwarf_getaranges.c b/libdw/dwarf_getaranges.c
index b6c194255b8734b8ac95d1815204f6147009e833..2a2e38dcff1d5848aeede4fdc18c62ef6c3279e8 100644 (file)
--- a/libdw/dwarf_getaranges.c
+++ b/libdw/dwarf_getaranges.c
@@ -204,7 +204,8 @@ dwarf_getaranges (dbg, aranges, naranges)
            offset_size = 8;
          else
            offset_size = 4;
-         new_arange->arange.offset = DIE_OFFSET_FROM_CU_OFFSET (offset, offset_size);
+         new_arange->arange.offset = DIE_OFFSET_FROM_CU_OFFSET (offset,
+                                                                offset_size);
 
          /* Sanity-check the data.  */
          if (new_arange->arange.offset

diff --git a/libdw/dwarf_getattrs.c b/libdw/dwarf_getattrs.c
index 876475e60a62bda8f8fbf5addafa248cc3b6d06b..35951304fded1b828738247e67b43f9f063ddc3d 100644 (file)
--- a/libdw/dwarf_getattrs.c
+++ b/libdw/dwarf_getattrs.c
@@ -96,7 +96,7 @@ dwarf_getattrs (Dwarf_Die *die, int (*callback) (Dwarf_Attribute *, void *),
 
       /* Get attribute name and form.  */
       Dwarf_Attribute attr;
-      const unsigned char * remembered_attrp = attrp;
+      const unsigned char *remembered_attrp = attrp;
 
       // XXX Fix bound checks
       get_uleb128 (attr.code, attrp);