From patchwork Tue Nov 24 21:14:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Matthias_M=C3=A4nnich?= X-Patchwork-Id: 41184 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F11AC3958C2C; Tue, 24 Nov 2020 21:14:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F11AC3958C2C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1606252494; bh=PcV84PDMraIvnwyIn+SnP4DtUQRyRDSbvfftwtXZ72w=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:Cc:From; b=T7So5yEJiYdYAV5nIvYGfB5fbWJHzRdjsMCxGVVzJ3c3Bf470I+LoOOKPyUeTGBAJ QZoYF6Wt0q62rZwufOGq76c6JvOetFem4/oaBt9J1qLY97QX7hx8/87BIx+3TpjYhS XlvZCq6+osNm1JcxdyAwuj11nSNAU6NTPwx/ph/A= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-qk1-x749.google.com (mail-qk1-x749.google.com [IPv6:2607:f8b0:4864:20::749]) by sourceware.org (Postfix) with ESMTPS id 6EACE3958C19 for ; Tue, 24 Nov 2020 21:14:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6EACE3958C19 Received: by mail-qk1-x749.google.com with SMTP id t141so18314257qke.22 for ; Tue, 24 Nov 2020 13:14:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:message-id:mime-version:subject:from :to:cc; bh=PcV84PDMraIvnwyIn+SnP4DtUQRyRDSbvfftwtXZ72w=; b=AR1LGKElh1V5+9g6E4SEEzWv7EYTMTvY01ZnhldTWDV+8li9HgPvphXZWTTnhVc/JS zaID+3AUiOcLrDd6quFnEQNo8+NI+o8LT8W/G0BSEXDM4o31F1mMvJVFDfn4YddfI1W+ vYcvzOoycGUhXUbnDF/I3cY2TpiCt1mmsRDePm2UMRQBnA3sCQQ+JN+KDmnOBu0YEHGt gp1KuYzET6IQQYrnkkCLipDt885a5YXNkvidngYtqoaITwwVq/bVM5qjpI47myPhsqQp g8KK6QD/fftrilVOkDlaE+SYwWQ0Xc+6bJJAnrYF6OGpiWd5BVxagQc6PTlMbk1GghPS lq5Q== X-Gm-Message-State: AOAM531bf4j6ohB4AZbm/IltMqjmHdwO5I8lXShB2e2VYzJBWaRdGu9W Rd+IR3Pubj0PU8Tf3h3COHKspLcrFBad8FwkVEi8iym1PE9gW8tjbspBUCvLdIc+IgEAQVIzJCG fYE0dy9qNMzl3yXRv2C5HmURUqWtVObT+0nZlfgyDF9y3S6qgeC9+TV25DLyPRf55kGrG7KY= X-Google-Smtp-Source: ABdhPJwai0k+NDt6KChzEfvHi1i6MTnu67YmAUHEewtWofPGjjQGg1v5wep32v7EBFZ7TPwGb9AssayZqYvSog== X-Received: from lux.lon.corp.google.com ([2a00:79e0:d:210:7220:84ff:fe09:a3aa]) (user=maennich job=sendgmr) by 2002:a0c:9ad8:: with SMTP id k24mr165675qvf.28.1606252490898; Tue, 24 Nov 2020 13:14:50 -0800 (PST) Date: Tue, 24 Nov 2020 21:14:43 +0000 Message-Id: <20201124211443.549804-1-maennich@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog Subject: [PATCH] abipkgdiff: minor cleanups To: libabigail@sourceware.org X-Spam-Status: No, score=-22.9 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Matthias Maennich via Libabigail From: =?utf-8?q?Matthias_M=C3=A4nnich?= Reply-To: Matthias Maennich Cc: maennich@google.com, kernel-team@android.com Errors-To: libabigail-bounces@sourceware.org Sender: "Libabigail" 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 --- tools/abipkgdiff.cc | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) 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_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 +