Fixing too-long lines and indent mistakes and

trailing whitespace.
	modified:   src/lib/libdwarf/dwarf_fission_to_cu.c
	modified:   src/lib/libdwarf/dwarf_loc.c
Also removed #if 0 dead code.
	modified:   src/lib/libdwarf/dwarf_loclists.c
	modified:   src/lib/libdwarf/dwarf_rnglists.c

Author: davea42

src/lib/libdwarf/dwarf_fission_to_cu.c

@@ -49,9 +49,9 @@
 #include "dwarf_loclists.h"
 #include "dwarf_rnglists.h"
 
-/*   RETURNS DW_DLV_OK and sets values
-     through  the return-value pointers.
-     Or returns DW_DLV_NO_ENTRY */
+/*  RETURNS DW_DLV_OK and sets values
+    through  the return-value pointers.
+    Or returns DW_DLV_NO_ENTRY */
 int
 _dwarf_has_SECT_fission(Dwarf_CU_Context ctx,
     unsigned int      SECT_number,
@@ -63,15 +63,13 @@ _dwarf_has_SECT_fission(Dwarf_CU_Context ctx,
 
     fis = &ctx->cc_dwp_offsets;
     if (fis->pcu_type && fis->pcu_size[fisindex]) {
-              *loclistsbase = fis->pcu_offset[fisindex];
-              *hasfissionoffset = TRUE;
+        *loclistsbase = fis->pcu_offset[fisindex];
+        *hasfissionoffset = TRUE;
         return DW_DLV_OK;
     }
     return DW_DLV_NO_ENTRY;
 }
 
-
-
 /*  ASSERT: dbg,cu_context, and fsd are non-NULL
     as the caller ensured that.
     With no DW_AT_loclists_base this computes one. */

src/lib/libdwarf/dwarf_loc.c

@@ -1634,7 +1634,7 @@ dwarf_get_loclist_c(Dwarf_Attribute attr,
     if (form == DW_FORM_loclistx || form == DW_FORM_sec_offset) {
         /* Aimed at DWARF5 and later */
         res = dwarf_global_formref_b(attr,&attr_val,
-                &offset_is_info,error);
+            &offset_is_info,error);
         if (res != DW_DLV_OK) {
             return res;
         }
@@ -1651,7 +1651,8 @@ dwarf_get_loclist_c(Dwarf_Attribute attr,
             } else if (DBG_HAS_SECONDARY(dbg)){
                 dbg = dbg->de_secondary_dbg;
                 CHECK_DBG(dbg,error,
-                    "dwarf_loclists_get_lle_head() via attribute(sec)");
+                    "dwarf_loclists_get_lle_head() "
+                    "via attribute(sec)");
             }
         } else {
             /*  attr_val is .debug_loclists[.dwo]

src/lib/libdwarf/dwarf_loclists.c

@@ -501,7 +501,7 @@ _dwarf_internal_read_loclists_header(Dwarf_Debug dbg,
     } /* else no offset table */
 
     buildhere->lc_offsets_off_in_sect = offset+localoff;
-    buildhere->lc_first_loclist_offset = 
+    buildhere->lc_first_loclist_offset =
         buildhere->lc_offsets_off_in_sect + lists_len;
     buildhere->lc_loclists_header = startdata;
     buildhere->lc_endaddr = startdata + buildhere->lc_length;
@@ -949,7 +949,7 @@ int dwarf_get_loclist_lle(Dwarf_Debug dbg,
 
 /*  We have more data than we need here if the compiler
     provided a loclists_base_address or provided
-    a DW_SECT_LOCLISTS  Per_CU value set for loclists. 
+    a DW_SECT_LOCLISTS  Per_CU value set for loclists.
     Or we plucked an offset from .debug_addr. */
 static int
 _dwarf_which_loclists_context(Dwarf_Debug dbg,
@@ -976,29 +976,28 @@ _dwarf_which_loclists_context(Dwarf_Debug dbg,
         return DW_DLV_NO_ENTRY;
     }
     if (count == 1) {
-        *index = 0; 
+        *index = 0;
         return DW_DLV_OK;
     }
 
-
     if (ctx->cc_loclists_base_present) {
         loclists_base_present = ctx->cc_loclists_base_present;
         loclists_base = ctx->cc_loclists_base;
         found_base = TRUE;
         chosen_offset = loclists_base;
-    } 
+    }
     if (!found_base) {
-         res = _dwarf_has_SECT_fission(ctx,
-             DW_SECT_LOCLISTS,
-             &loclists_base_present,&loclists_base);
-         if (res == DW_DLV_OK) {
-             found_base = TRUE;
-             chosen_offset = loclists_base;
-         }
+        res = _dwarf_has_SECT_fission(ctx,
+            DW_SECT_LOCLISTS,
+            &loclists_base_present,&loclists_base);
+        if (res == DW_DLV_OK) {
+            found_base = TRUE;
+            chosen_offset = loclists_base;
+        }
     }
     if (!found_base) {
-         loclists_base = loclist_offset;
-         chosen_offset = loclist_offset;
+        loclists_base = loclist_offset;
+        chosen_offset = loclist_offset;
     }
 
     rcx = array[i];
@@ -1039,21 +1038,21 @@ _dwarf_which_loclists_context(Dwarf_Debug dbg,
             dwarfstring_destructor(&m);
             return DW_DLV_ERROR;
         }
-    } 
+    }
     {
-            dwarfstring m;
+        dwarfstring m;
 
-            dwarfstring_constructor(&m);
-            dwarfstring_append_printf_u(&m,
-                "DW_DLE_LOCLISTS_ERROR: loclist base of "
-                " 0x%" DW_PR_XZEROS DW_PR_DUx ,chosen_offset);
-            dwarfstring_append(&m,
-                " was not found anywhere in .debug_loclists[.dwo] "
-                "data. Corrupted data?");
-            _dwarf_error_string(dbg,error,
-                DW_DLE_LOCLISTS_ERROR,
-                dwarfstring_string(&m));
-            dwarfstring_destructor(&m);
+        dwarfstring_constructor(&m);
+        dwarfstring_append_printf_u(&m,
+            "DW_DLE_LOCLISTS_ERROR: loclist base of "
+            " 0x%" DW_PR_XZEROS DW_PR_DUx ,chosen_offset);
+        dwarfstring_append(&m,
+            " was not found anywhere in .debug_loclists[.dwo] "
+            "data. Corrupted data?");
+        _dwarf_error_string(dbg,error,
+            DW_DLE_LOCLISTS_ERROR,
+            dwarfstring_string(&m));
+        dwarfstring_destructor(&m);
     }
     return DW_DLV_ERROR;
 }
@@ -1233,7 +1232,7 @@ _dwarf_loclists_fill_in_lle_head(Dwarf_Debug dbg,
     Dwarf_Unsigned secsize = 0;
 
     if (theform == DW_FORM_loclistx) {
-        is_loclistx = TRUE; 
+        is_loclistx = TRUE;
     } else {
         offset_in_loclists = attr_val;
     }
@@ -1281,7 +1280,7 @@ _dwarf_loclists_fill_in_lle_head(Dwarf_Debug dbg,
     }
     /*  A */
     if (ctx->cc_loclists_base_present) {
-            offset_in_loclists = ctx->cc_loclists_base;
+        offset_in_loclists = ctx->cc_loclists_base;
     } else {
         offset_in_loclists = attr_val;
     }
@@ -1291,11 +1290,11 @@ _dwarf_loclists_fill_in_lle_head(Dwarf_Debug dbg,
             "DW_DLE_LLE_ERROR: a .debug_loclists offset "
             "is greater than the loclists section size");
         return DW_DLV_ERROR;
-    } 
+    }
     /*  B */
     {
         res = _dwarf_which_loclists_context(dbg,ctx,
-            offset_in_loclists, 
+            offset_in_loclists,
             &loclists_contextnum,error);
         if (res == DW_DLV_OK) {
             /* FALL THROUGH */

src/lib/libdwarf/dwarf_rnglists.c

@@ -779,7 +779,8 @@ dwarf_get_rnglist_offset_index_value(
     localoffset = offsetentry_index*offset_len;
     if (localoffset >= con->rc_length) {
         _dwarf_error_string(dbg,error, DW_DLE_RLE_ERROR,
-            "DW_DLE_RLE_ERROR: a .debug_rnglists[.dwo] section offset "
+            "DW_DLE_RLE_ERROR: a .debug_rnglists[.dwo] "
+            "section offset "
             "is greater than this rnglists table length");
         return DW_DLV_ERROR;
     }
@@ -1072,10 +1073,8 @@ _dwarf_which_rnglists_context(Dwarf_Debug dbg,
     Dwarf_Bool              found_base = FALSE;
     Dwarf_Unsigned          chosen_offset = 0;
 
-
-
     array = dbg->de_rnglists_context;
-    count = dbg->de_rnglists_context_count;    
+    count = dbg->de_rnglists_context_count;
 
     if (!array) {
         return DW_DLV_NO_ENTRY;
@@ -1089,27 +1088,25 @@ _dwarf_which_rnglists_context(Dwarf_Debug dbg,
         rnglists_base = ctx->cc_rnglists_base;
         found_base = TRUE;
         chosen_offset = rnglists_base;
-    } 
+    }
     if (!found_base) {
-         res = _dwarf_has_SECT_fission(ctx,
-             DW_SECT_RNGLISTS,
-             &rnglists_base_present,&rnglists_base);
-         if (res == DW_DLV_OK) {
-             found_base = TRUE;
-             chosen_offset = rnglists_base;
-         }
+        res = _dwarf_has_SECT_fission(ctx,
+            DW_SECT_RNGLISTS,
+            &rnglists_base_present,&rnglists_base);
+        if (res == DW_DLV_OK) {
+            found_base = TRUE;
+            chosen_offset = rnglists_base;
+        }
     }
     if (!found_base) {
-         rnglists_base = rnglist_offset;
-         chosen_offset = rnglist_offset;
+        rnglists_base = rnglist_offset;
+        chosen_offset = rnglist_offset;
     }
 
     rcx = array[i];
     rcxoff = rcx->rc_header_offset;
     rcxend = rcxoff + rcx->rc_length;
 
-
-
     {
         /* We look at the location of each rnglist context
             to find one with the offset we want */
@@ -1143,57 +1140,21 @@ _dwarf_which_rnglists_context(Dwarf_Debug dbg,
             dwarfstring_destructor(&m);
             return DW_DLV_ERROR;
         }
-    } 
-#if 0
-else {
-        /*  We have a DW_AT_rnglists_base (cc_rnglists_base),
-            let's use it. */
-        Dwarf_Unsigned lookfor = 0;;
-
-        lookfor = ctx->cc_rnglists_base;
-        for ( i = 0 ; i < count; ++i) {
-            dwarfstring m;
-            Dwarf_Rnglists_Context rcx = array[i];
-
-            if (rcx->rc_offsets_off_in_sect == lookfor){
-                *index = i;
-                return DW_DLV_OK;
-            }
-            if (rcx->rc_offsets_off_in_sect < lookfor){
-                continue;
-            }
-
-            dwarfstring_constructor(&m);
-            dwarfstring_append_printf_u(&m,
-                "DW_DLE_RNGLISTS_ERROR: rnglists base of "
-                " 0x%" DW_PR_XZEROS DW_PR_DUx ,chosen_offset);
-            dwarfstring_append_printf_u(&m,
-                " was not found though we are now at base "
-                " 0x%" DW_PR_XZEROS DW_PR_DUx ,
-                rcx->rc_offsets_off_in_sect);
-            _dwarf_error_string(dbg,error,
-                DW_DLE_RNGLISTS_ERROR,
-                dwarfstring_string(&m));
-            dwarfstring_destructor(&m);
-            return DW_DLV_ERROR;
-        }
-    {
-#endif
-
+    }
     {
-            dwarfstring m;
+        dwarfstring m;
 
-            dwarfstring_constructor(&m);
-            dwarfstring_append_printf_u(&m,
-                "DW_DLE_RNGLISTS_ERROR: rnglist base of "
-                " 0x%" DW_PR_XZEROS DW_PR_DUx ,chosen_offset);
-            dwarfstring_append(&m,
-                " was not found anywhere in .debug_rnglists[.dwo] "
-                "data. Corrupted data?");
-            _dwarf_error_string(dbg,error,
-                DW_DLE_RNGLISTS_ERROR,
-                dwarfstring_string(&m));
-            dwarfstring_destructor(&m);
+        dwarfstring_constructor(&m);
+        dwarfstring_append_printf_u(&m,
+            "DW_DLE_RNGLISTS_ERROR: rnglist base of "
+            " 0x%" DW_PR_XZEROS DW_PR_DUx ,chosen_offset);
+        dwarfstring_append(&m,
+            " was not found anywhere in .debug_rnglists[.dwo] "
+            "data. Corrupted data?");
+        _dwarf_error_string(dbg,error,
+            DW_DLE_RNGLISTS_ERROR,
+            dwarfstring_string(&m));
+        dwarfstring_destructor(&m);
     }
     return DW_DLV_ERROR;
 }
@@ -1533,42 +1494,7 @@ _dwarf_fill_in_rle_head(Dwarf_Debug dbg,
 
     /* A */
     if (ctx->cc_rnglists_base_present) {
-            offset_in_rnglists = ctx->cc_rnglists_base;
-#if 0
-         else  if (originalctx->cc_is_dwo) {
-            /*  Generate a base and set as 'present'
-                by looking at the location offset
-                table that we are supposedly indexing into.
-                finding what the table value is.
-                An implicit rnglists_base.
-                Will not work with multiple rnglists! */
-                int ires = 0;
-                Dwarf_Unsigned ibase = 0;
-
-                ires = _dwarf_implicit_rnglists_base(dbg,
-                    attr_val,&ibase);
-                if (ires != DW_DLV_OK) {
-                    dwarfstring m;
-
-                    dwarfstring_constructor(&m);
-                    dwarfstring_append_printf_u(&m,
-                        "DW_DLE_RNGLISTS_ERROR: rnglists table"
-                        " index of"
-                        " %u"  ,attr_val);
-                    dwarfstring_append(&m,
-                        " is unusable, there is no default "
-                        " rnglists base address ");
-                    _dwarf_error_string(dbg,error,
-                        DW_DLE_RNGLISTS_ERROR,
-                        dwarfstring_string(&m));
-                    dwarfstring_destructor(&m);
-                    return DW_DLV_ERROR;
-            }
-            ctx->cc_rnglists_base_present = TRUE;
-            ctx->cc_rnglists_base         = ibase;
-            offset_in_rnglists = ibase;
-        }
-#endif
+        offset_in_rnglists = ctx->cc_rnglists_base;
     } else {
         offset_in_rnglists = attr_val;
     }
@@ -1596,16 +1522,7 @@ _dwarf_fill_in_rle_head(Dwarf_Debug dbg,
         } else {
             return res;
         }
-
     }
-#if 0
-     else {
-        /*  For DWO rnglists use gcc/clang approach  missing
-            DW_AT_rnglists_base.
-            Examples seem to have just 1 rnglists_context.*/
-        rnglists_contextnum = 0;
-    }
-#endif
     /* C */
     array = localdbg->de_rnglists_context;
     rctx = array[rnglists_contextnum];
@@ -1667,14 +1584,16 @@ _dwarf_fill_in_rle_head(Dwarf_Debug dbg,
             table_entry,offsetsize,error,enddata);
         if (table_entryval >= secsize) {
             _dwarf_error_string(dbg,error, DW_DLE_RLE_ERROR,
-                "DW_DLE_RLE_ERROR: a .debug_rnglists[.dwo] table entry "
+                "DW_DLE_RLE_ERROR: a .debug_rnglists[.dwo] "
+                "table entry "
                 "value is impossibly large");
             return DW_DLV_ERROR;
         }
         if ((rctx->rc_offsets_off_in_sect +
             table_entryval) >= secsize) {
             _dwarf_error_string(dbg,error, DW_DLE_RLE_ERROR,
-                "DW_DLE_RLE_ERROR: a .debug_rnglist[.dwo]s table entry "
+                "DW_DLE_RLE_ERROR: a .debug_rnglist[.dwo]s "
+                "table entry "
                 "value + section offset  is impossibly large");
             return DW_DLV_ERROR;
         }