Drop pri::form

diff --git a/dwarflint/check_debug_info.cc b/dwarflint/check_debug_info.cc
index b46c7a15eff96e37ece9a3538c2553e5a9492eee..7dafb46cb545f2d866ec8254b5791ec1ba8d8393 100644 (file)
--- a/dwarflint/check_debug_info.cc
+++ b/dwarflint/check_debug_info.cc
@@ -692,7 +692,7 @@ namespace
                    || (bitness == fb_64 && cu->head->offset_size == 4))
                  wr_error (where)
                    << "reference attribute with form \""
-                   << pri::form (form_name) << "\" in "
+                   << elfutils::dwarf::forms::name (form_name) << "\" in "
                    << (8 * cu->head->offset_size) << "-bit CU."
                    << std::endl;
              }
@@ -816,7 +816,8 @@ namespace
                if (relocate == rel_no)
                  wr_message (where, cat (mc_impact_4, mc_die_other,
                                          mc_reloc, extra_mc))
-                   << "unexpected relocation of " << pri::form (form_name)
+                   << "unexpected relocation of "
+                   << elfutils::dwarf::forms::name (form_name)
                    << '.' << std::endl;
 
                if (attribute != NULL)
@@ -839,7 +840,8 @@ namespace
                            && value != 0)))
                  wr_message (where, cat (mc_impact_2, mc_die_other,
                                          mc_reloc, extra_mc))
-                   << pri::lacks_relocation (pri::form (form_name))
+                   << pri::lacks_relocation
+                       (elfutils::dwarf::forms::name (form_name))
                    << std::endl;
              }
 

diff --git a/dwarflint/dwarf_version.cc b/dwarflint/dwarf_version.cc
index 10bfcbd2893ad934915f257181f1ba11fa85d9d4..d3401449b10c74054eaeb3f5b030f62d67b74291 100644 (file)
--- a/dwarflint/dwarf_version.cc
+++ b/dwarflint/dwarf_version.cc
@@ -38,7 +38,6 @@
 #include "dwarf_gnu.hh"
 #include "dwarf_mips.hh"
 #include "check_debug_info.hh"
-#include "pri.hh"
 #include "c++/dwarf"
 
 #include "../libdw/dwarf.h"
@@ -119,7 +118,7 @@ form::width (cu_head const *cu_head) const
 std::ostream &
 operator << (std::ostream &os, form const &obj)
 {
-  return os << pri::form (obj.name ());
+  return os << elfutils::dwarf::forms::name (obj.name ());
 }
 
 namespace

diff --git a/dwarflint/pri.cc b/dwarflint/pri.cc
index 3c20bc0949dbdd77dddf9630c6ebd5862253772c..ef8bd31a8340c4ddae969dd7181e817644421893 100644 (file)
--- a/dwarflint/pri.cc
+++ b/dwarflint/pri.cc
@@ -38,10 +38,6 @@ pri::operator << (std::ostream &os, pri::pribase const &obj)
   return os << obj.m_s;
 }
 
-pri::form::form (int attr_form)
-  : pribase (dwarf_form_string (attr_form))
-{}
-
 pri::locexpr_opcode::locexpr_opcode (int opcode)
   : pribase (dwarf_locexpr_opcode_string (opcode))
 {}

diff --git a/dwarflint/pri.hh b/dwarflint/pri.hh
index c5c6f6afd44e90bc15d69d1918ddaf88b776ebfc..fe61af6638e48d5dc42594df571a36e5cdc3ca8d 100644 (file)
--- a/dwarflint/pri.hh
+++ b/dwarflint/pri.hh
@@ -66,12 +66,6 @@ namespace pri
     {}
   };
 
-  struct form
-    : public pribase
-  {
-    form (int attr_form);
-  };
-
   struct locexpr_opcode
     : public pribase
   {