dwarflint: Nits

diff --git a/dwarflint/check_debug_info.cc b/dwarflint/check_debug_info.cc
index c28a043ccf6ee78ae6b6ddf8b69314bf0189c8f6..406d0c887655d3d17353d900f7868a4872cfa8f4 100644 (file)
--- a/dwarflint/check_debug_info.cc
+++ b/dwarflint/check_debug_info.cc
@@ -623,7 +623,6 @@ namespace
            where.ref = &it->where;
 
            int form_name = it->form;
-           form const *form = ver->get_form (form_name);
            attribute const *attribute = ver->get_attribute (it->name);
            bool indirect = form_name == DW_FORM_indirect;
            if (indirect)
@@ -669,6 +668,7 @@ namespace
                wr_error (&where, ": indirect form is again indirect.\n");
                return -1;
              }
+           form const *form = ver->get_form (form_name);
 
            value_check_cb_t value_check_cb = NULL;
 

diff --git a/dwarflint/dwarf_version.hh b/dwarflint/dwarf_version.hh
index 3868df82e67dbf4b7f1999712fc82412fdcf269d..dd1fd45bb0a681d481f24fffd83aae3dbb1b49dc 100644 (file)
--- a/dwarflint/dwarf_version.hh
+++ b/dwarflint/dwarf_version.hh
@@ -121,7 +121,7 @@ public:
   /// Return value is never fw_offset or fw_address.  These get
   /// resolved to fw_4 or fw_8 depending on corresponding value in
   /// CU->head.
-  form_width_t width (cu const *cu = NULL) const;
+  form_width_t width (cu const *cu) const;
 
   /// Return storage class of given form.  Closely related to width.
   storage_class_t