All had trailing whitespace.

One or two had an indent error.
	modified:   src/bin/dwarfdump/print_die.c
	modified:   src/bin/dwarfgen/ireptodbg.cc
	modified:   src/lib/libdwarf/dwarf_debugnames.c
	modified:   src/lib/libdwarf/dwarf_elfread.c
	modified:   src/lib/libdwarf/dwarf_macro5.c
	modified:   src/lib/libdwarf/dwarf_query.c
	modified:   src/lib/libdwarf/libdwarf.h

Author: davea42

src/bin/dwarfdump/print_die.c

@@ -4735,8 +4735,8 @@ print_attribute(Dwarf_Debug dbg, Dwarf_Die die,
     case DW_AT_language_version: {
         char         atnamebuf[ESB_FIXED_ALLOC_SIZE];
         struct esb_s langver;
-        
-        if (fc != DW_FORM_CLASS_STRING) {
+
+        if (fc != DW_FORM_CLASS_CONSTANT) {
             remark_wrong_string_format(attr,theform);
             esb_destructor(&valname);
             esb_destructor(&esb_extra);
@@ -4784,7 +4784,7 @@ print_attribute(Dwarf_Debug dbg, Dwarf_Die die,
             &lv_lower_bound, &lv_version_details);
         if (res == DW_DLV_OK) {
             esb_append_printf_i(&valname,
-                "(low bound: %d",lv_lower_bound);
+                " (low bound: %d",lv_lower_bound);
             if (lv_version_details) {
                 esb_append_printf_s(&valname,
                     " format: %s)",
@@ -8613,7 +8613,16 @@ get_attr_value(Dwarf_Debug dbg, Dwarf_Half tag,
                     Dwarf_Bool hex_format = TRUE;
                     Dwarf_Half dwversion = 0;
 
-                    formx_unsigned(tempud,esbp,hex_format);
+                    if (attr == DW_AT_language_version) {
+                        hex_format = FALSE;
+                        formx_unsigned(tempud,esbp,hex_format);
+                        esb_append(esbp," (");
+                        hex_format = TRUE;
+                        formx_unsigned(tempud,esbp,hex_format);
+                        esb_append(esbp,")");
+                    } else {
+                        formx_unsigned(tempud,esbp,hex_format);
+                    }
                     /* Check attribute encoding */
                     if (glflags.gf_check_attr_encoding) {
                         check_attributes_encoding(attr,theform,
@@ -8778,34 +8787,77 @@ get_attr_value(Dwarf_Debug dbg, Dwarf_Half tag,
         }
         }
         break;
-    case DW_FORM_sdata:
-        wres = dwarf_formsdata(attrib, &tempsd, err);
-        if (wres == DW_DLV_OK) {
-            Dwarf_Bool hxform=TRUE;
-            tempud = tempsd;
-            formx_unsigned_and_signed_if_neg(tempud,tempsd,
-                " (",hxform,esbp);
-        } else if (wres == DW_DLV_NO_ENTRY) {
-            /* nothing? */
-        } else {
-            print_error_and_continue(
-                "Cannot get DW_FORM_sdata value..",
-                wres, *err);
-            return wres;
+    case DW_FORM_sdata: {
+        Dwarf_Half attrs = 0;
+        int ares = 0;
+        Dwarf_Bool hxform=TRUE;
+        Dwarf_Error attrerr = 0;
+
+        ares = dwarf_whatattr(attrib, &attrs, &attrerr);
+        {   /* Do regardless of ares value! */
+            wres = dwarf_formsdata(attrib, &tempsd, err);
+            if (wres == DW_DLV_OK) {
+                tempud = tempsd;
+                if (attrs == DW_AT_language_version) {
+                    hxform = FALSE;
+                    formx_signed(tempsd,esbp);
+                    esb_append(esbp," (");
+                    hxform = TRUE;
+                    formx_unsigned_and_signed_if_neg(tempud,tempsd,
+                        " (",hxform,esbp);
+                    esb_append(esbp,")");
+                } else {
+                    formx_unsigned_and_signed_if_neg(tempud,tempsd,
+                        " (",hxform,esbp);
+                }
+            } else if (wres == DW_DLV_NO_ENTRY) {
+                /* nothing? */
+            } else {
+                print_error_and_continue(
+                    "Cannot get DW_FORM_sdata value..",
+                    wres, *err);
+                return wres;
+            }
+        }
+        if (ares == DW_DLV_ERROR) {
+            /* leave no trace, caught elsewhere. */
+            dwarf_dealloc_error(dbg,attrerr);
+        }
         }
         break;
-    case DW_FORM_udata:
-        wres = dwarf_formudata(attrib, &tempud, err);
-        if (wres == DW_DLV_OK) {
-            Dwarf_Bool hex_format = TRUE;
-            formx_unsigned(tempud,esbp,hex_format);
-        } else if (wres == DW_DLV_NO_ENTRY) {
-            /* nothing? */
-        } else {
-            print_error_and_continue(
-                "Cannot get DW_FORM_udata value..",
-                wres, *err);
-            return wres;
+    case DW_FORM_udata: {
+        Dwarf_Half attru = 0;
+        int ares = 0;
+        Dwarf_Error attrerr = 0;
+
+        ares = dwarf_whatattr(attrib, &attru, err);
+        {   /* Do regardless of ares value! */
+            wres = dwarf_formudata(attrib, &tempud, err);
+            if (wres == DW_DLV_OK) {
+                Dwarf_Bool hex_format = TRUE;
+                if (attru == DW_AT_language_version) {
+                    hex_format = FALSE;
+                    formx_unsigned(tempud,esbp,hex_format);
+                    esb_append(esbp," (");
+                    hex_format = TRUE;
+                    formx_unsigned(tempud,esbp,hex_format);
+                    esb_append(esbp,")");
+                } else {
+                    formx_unsigned(tempud,esbp,hex_format);
+                }
+            } else if (wres == DW_DLV_NO_ENTRY) {
+                /* nothing? */
+            } else {
+                print_error_and_continue(
+                    "Cannot get DW_FORM_udata value..",
+                    wres, *err);
+                return wres;
+            }
+        }
+        if (ares == DW_DLV_ERROR) {
+            /* leave no trace, caught elsewhere. */
+            dwarf_dealloc_error(dbg,attrerr);
+        }
         }
         break;
     /* various forms for strings. */

src/bin/dwarfgen/ireptodbg.cc

@@ -150,7 +150,7 @@ createskipbranchblock(
     return DW_DLV_OK;
 }
 
-static void 
+static void
 addLanguageVersion(Dwarf_P_Debug dbg,
     IRepresentation & Irep,
     Dwarf_P_Die ourdie,
@@ -197,45 +197,34 @@ addLanguageVersion(Dwarf_P_Debug dbg,
     //    add new attr.
 
         IRAttr attr2(DW_AT_language_name,
-                DW_FORM_udata,
-                DW_FORM_udata);
+            DW_FORM_udata,
+            DW_FORM_udata);
         attr2.setFormClass(DW_FORM_CLASS_CONSTANT);
         IRFormConstant *f = new IRFormConstant(
-                DW_FORM_udata,
-                DW_FORM_udata,
-                DW_FORM_CLASS_CONSTANT,
-                IRFormConstant::UNSIGNED,
-                DW_LNAME_C,
-                0);
+            DW_FORM_udata,
+            DW_FORM_udata,
+            DW_FORM_CLASS_CONSTANT,
+            IRFormConstant::UNSIGNED,
+            DW_LNAME_C,
+            0);
         attr2.setFormData(f);
         revisedattrs.push_back(attr2);
     }
     if (!found_lv_version) {
     //    add new attr.
         IRAttr attr2(DW_AT_language_version,
-                DW_FORM_string,
-                DW_FORM_string);
-        attr2.setFormClass(DW_FORM_CLASS_STRING);
-        IRFormString *f = new IRFormString();
-        f->setInitialForm(DW_FORM_string);
-        f->setFinalForm(DW_FORM_string);
-        f->setString("YYYYMM");
+            DW_FORM_string,
+            DW_FORM_string);
+        attr2.setFormClass(DW_FORM_CLASS_CONSTANT);
+        IRFormConstant *f = new IRFormConstant(
+            DW_FORM_udata,
+            DW_FORM_udata,
+            DW_FORM_CLASS_CONSTANT,
+            IRFormConstant::UNSIGNED,
+            199902,
+            0);
         attr2.setFormData(f);
         revisedattrs.push_back(attr2);
-#if 0
-    Dwarf_Half attrnum = DW_AT_name;
-    const char *attrname("vardata16");
-    IRAttr attr2(attrnum,
-        DW_FORM_string,
-        DW_FORM_string);
-    attr2.setFormClass(DW_FORM_CLASS_STRING);
-    IRFormString *f = new IRFormString();
-    f->setInitialForm(DW_FORM_string);
-    f->setFinalForm(DW_FORM_string);
-    f->setString(attrname);
-    attr2.setFormData(f);
-    revisedattrs.push_back(attr2);
-#endif
     }
     // Avoid memoryleak
     //attr.dropFormData();

src/lib/libdwarf/dwarf_debugnames.c

@@ -847,9 +847,9 @@ dwarf_dnames_header(Dwarf_Debug dbg,
         curptr += usedspace;
         for ( ; curptr < end_section; ++curptr) {
             if (*curptr) {
-                /* Fixing Coverity Scan CID 581830 
-                   resource leak if just call dealloc,
-                   so call local dealloc to do it. */
+                /*  Fixing Coverity Scan CID 581830
+                    resource leak if just call dealloc,
+                    so call local dealloc to do it. */
                 dwarf_dealloc_dnames(dn);
                 /*  One could argue this is a harmless error,
                     but for now assume it is real corruption. */

src/lib/libdwarf/dwarf_elfread.c

@@ -314,9 +314,9 @@ elf_load_nolibelf_section_a (void* obj,
         void *         mmptr = 0;
 
         /*  pagesize is guaranteed to be a multiple of 2,
-            and will be >= 512 and is usually 4096. 
+            and will be >= 512 and is usually 4096.
             this helps coverityscan know that sutracting one
-            from pagesize will not result in an 
+            from pagesize will not result in an
             anomalous number. */
         if (pagesize < 200L || pagesize > (128L*1024L*1024L)) {
             /*  verifying the value of pagesize to help fix

src/lib/libdwarf/dwarf_macro5.c

@@ -315,11 +315,11 @@ is_defundef(unsigned op)
 #endif /*0*/
 
 /*  On first call (for this macro_context),
-    build_ops_array is FALSE. 
-    We just calculate 
-        macro_context->mc_macro_ops_count 
+    build_ops_array is FALSE.
+    We just calculate
+        macro_context->mc_macro_ops_count
         macro_context->mc_ops_data_length
-        macro_context->mc_total_length 
+        macro_context->mc_total_length
     On second,
     it is TRUE and we know the count so we allocate and fill in
     the ops array. */
@@ -373,7 +373,7 @@ _dwarf_get_macro_ops_count_internal(Dwarf_Macro_Context macro_context,
                 so we lose a really useful and precise error
                 message and get this useless message. */
             if (known_ops_count != opcount) {
-                _dwarf_error_string(dbg, error, 
+                _dwarf_error_string(dbg, error,
                     DW_DLE_MACRO_OP_UNHANDLED,
                     "DW_DLE_MACRO_OP_UNHANDLED "
                     "A miscount of ops_count "
@@ -1631,18 +1631,18 @@ dwarf_dealloc_macro_context(Dwarf_Macro_Context mc)
     if (!mc) {
         return;
     }
-    /*  Fixing coverity sccan CID 531842 and CID 531840. 
+    /*  Fixing coverity sccan CID 531842 and CID 531840.
         Memory leak. The destructor would do this,
         but coverity scan does not seem to track that.
         so we do the free()s here and removed the
-        use of _dwarf_macro_destructor() from dwarf_alloc.c 
+        use of _dwarf_macro_destructor() from dwarf_alloc.c
         And we will delete _dwarf_macro_destructor()
         everywhere. */
     dbg = mc->mc_dbg;
     dealloc_macro_srcfiles(mc->mc_srcfiles, mc->mc_srcfiles_count);
     mc->mc_srcfiles = 0;
     mc->mc_srcfiles_count = 0;
-    free((void *)mc->mc_file_path); 
+    free((void *)mc->mc_file_path);
     mc->mc_file_path = 0;
     free(mc->mc_ops);
     mc->mc_ops = 0;

src/lib/libdwarf/dwarf_query.c

@@ -1752,8 +1752,8 @@ dwarf_srclanglname(Dwarf_Die die,
     Dwarf_Unsigned *ret_name, Dwarf_Error *error)
 {
     Dwarf_Unsigned luns = 0;
-    int res = _dwarf_die_attr_unsigned_constant(die, 
-       DW_AT_language_name,
+    int res = _dwarf_die_attr_unsigned_constant(die,
+        DW_AT_language_name,
         &luns, error);
     *ret_name = luns;
     return res;
@@ -2291,9 +2291,9 @@ dwarf_machine_architecture(Dwarf_Debug dbg,
         dw_ub_index,  dw_comdat_groupnumber);
 }
 /*
-   
+
     DWARF6 DW_LNAME values are referenced
-    by using dwarf_language_version_string() 
+    by using dwarf_language_version_string()
     (these are permitted in DWARF5, see
     www.dwarfstd.org  )
 

src/lib/libdwarf/libdwarf.h

@@ -2901,10 +2901,10 @@ DW_API int dwarf_bitoffset(Dwarf_Die dw_die,
 
     To access DW_LNAME names (in DWARF5 or later)
     see dwarf_srclanglname().
-    To get the DW_LNAME as a string, call 
+    To get the DW_LNAME as a string, call
     dwarf_get_LNAME_name().
 
-    DWARF5 and earlier 
+    DWARF5 and earlier
 
     The DIE should be a CU DIE.
     @param dw_die
@@ -2925,7 +2925,7 @@ DW_API int dwarf_srclang(Dwarf_Die dw_die,
 /*! @brief Return the value of the DW_AT_language_name attribute.
 
     New in v2.1.0 July 2025.
-            
+
     Returns a DWARF6  DW_AT language_name name.
     The DW_LNAME value returned lets one access
     the LNAME name as a string with dwarf_get_LNAME_name()
@@ -2935,7 +2935,7 @@ DW_API int dwarf_srclang(Dwarf_Die dw_die,
     To access DW_LANG names (in DWARF5 or earlier)
     see dwarf_srclang().
 
-    @param dw_die 
+    @param dw_die
     The DIE of interest, normally a CU_DIE.
     @param dw_returned_lname
     On success returns the language name (code) (normally
@@ -2945,9 +2945,9 @@ DW_API int dwarf_srclang(Dwarf_Die dw_die,
     The usual error detail return pointer.
     @return
     Returns DW_DLV_OK etc.
-*/  
+*/
 DW_API int dwarf_srclanglname(Dwarf_Die dw_die,
-    Dwarf_Unsigned *dw_returned_lname, 
+    Dwarf_Unsigned *dw_returned_lname,
     Dwarf_Error    *dw_error);
 
 /*! @brief Return the value of the DW_AT_language_version attribute.
@@ -2972,14 +2972,13 @@ DW_API int dwarf_srclanglname(Dwarf_Die dw_die,
     The usual error detail return pointer.
     @return
     Returns DW_DLV_OK etc.
-*/ 
+*/
 
 DW_API int dwarf_srclanglname_version(Dwarf_Die dw_die,
-    const char  *dw_returned_verstring, 
+    const char  *dw_returned_verstring,
     Dwarf_Error *dw_error);
 
-
-/*! @brief Return values associated with DW_AT_language_name 
+/*! @brief Return values associated with DW_AT_language_name
 
     Returns the value of a the default-lower-bound
     and a string defining the interpretation of