diff mbox series

abipkgdiff: minor cleanups

Message ID 20201124211443.549804-1-maennich@google.com
State New
Headers show
Series abipkgdiff: minor cleanups | expand

Commit Message

Matthias Maennich Nov. 24, 2020, 9:14 p.m. UTC
The recent changes to abipkgdiff triggered some minor clang-tidy
diagnostics that I address in this patch.

 - removed unused using statements
 - cleaned up some mismatches between commented and actual parameter names
 - removed shadowing data members from self_compare_task and construct
   with base class constructor instead.

	* tools/abipkgdiff.cc: remove unused using statements
	(self_compare_task): remove shadowing members and delegate
	construction to base class.

Signed-off-by: Matthias Maennich <maennich@google.com>
---
 tools/abipkgdiff.cc | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

Comments

Dodji Seketeli Nov. 25, 2020, 8:16 a.m. UTC | #1
Hello,

Matthias Maennich <maennich@google.com> a écrit:

> The recent changes to abipkgdiff triggered some minor clang-tidy
> diagnostics that I address in this patch.
>
>  - removed unused using statements
>  - cleaned up some mismatches between commented and actual parameter names
>  - removed shadowing data members from self_compare_task and construct
>    with base class constructor instead.
>
> 	* tools/abipkgdiff.cc: remove unused using statements
> 	(self_compare_task): remove shadowing members and delegate
> 	construction to base class.
>
> Signed-off-by: Matthias Maennich <maennich@google.com>

Applied to master.

Thanks!
diff mbox series

Patch

diff --git a/tools/abipkgdiff.cc b/tools/abipkgdiff.cc
index 344fe2899f12..6d3f5e791972 100644
--- a/tools/abipkgdiff.cc
+++ b/tools/abipkgdiff.cc
@@ -162,10 +162,7 @@  using abigail::dwarf_reader::create_read_context;
 using abigail::dwarf_reader::get_soname_of_elf_file;
 using abigail::dwarf_reader::get_type_of_elf_file;
 using abigail::dwarf_reader::read_corpus_from_elf;
-using abigail::xml_reader::read_corpus_from_native_xml_file;
-using abigail::xml_writer::HASH_TYPE_ID_STYLE;
 using abigail::xml_writer::create_write_context;
-using abigail::xml_writer::type_id_style_kind;
 using abigail::xml_writer::write_context_sptr;
 using abigail::xml_writer::write_corpus;
 
@@ -1533,7 +1530,7 @@  compare_to_self(const elf_file& elf,
   {
     read_context_sptr c =
       create_read_context(elf.path, di_dirs, env.get(),
-			  /*load_all_types=*/opts.show_all_types);
+			  /*read_all_types=*/opts.show_all_types);
 
     corp = read_corpus_from_elf(*c, c_status);
 
@@ -2038,19 +2035,8 @@  typedef shared_ptr<compare_task> compare_task_sptr;
 class self_compare_task : public compare_task
 {
 public:
-
-  compare_args_sptr args;
-  abidiff_status status;
-  ostringstream out;
-  string pretty_output;
-
-  self_compare_task()
-    : status(abigail::tools_utils::ABIDIFF_OK)
-  {}
-
   self_compare_task(const compare_args_sptr& a)
-    : args(a),
-      status(abigail::tools_utils::ABIDIFF_OK)
+    : compare_task(a)
   {}
 
   /// The job performed by the task.
@@ -2078,7 +2064,7 @@  public:
 	     ||( diff && diff->has_net_changes()))
       {
 	// There is an ABI change, tell the user about it.
-	diff->report(out, /*prefix=*/"  ");
+	diff->report(out, /*indent=*/"  ");
 
 	pretty_output +=
 	  string("======== comparing'") + name +