From patchwork Wed Jul 1 10:54:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Procida X-Patchwork-Id: 39857 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 184A63857007; Wed, 1 Jul 2020 10:54:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 184A63857007 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1593600876; bh=wLyEdosqVFHkKGkzbJoXKRxXRDUXMheKbzbil//PHQg=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:Cc:From; b=WIZGOeW8Mu+UoQHopNjD0gt4MepKPndWC8huQw/Ny3O+dltyP+GicUD7ywsHBcnee TwWk/qJd6I2jljpb10V7UjfUp5w51BGa6GavAx2HYEgp5xo0jQP5s83/S3vETPOmeL ralSv7dbGlEeykYL7Wd0cfLTlPl3C5HS1thYuULQ= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-wm1-x349.google.com (mail-wm1-x349.google.com [IPv6:2a00:1450:4864:20::349]) by sourceware.org (Postfix) with ESMTPS id 879373857007 for ; Wed, 1 Jul 2020 10:54:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 879373857007 Received: by mail-wm1-x349.google.com with SMTP id g187so22728812wme.0 for ; Wed, 01 Jul 2020 03:54:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=wLyEdosqVFHkKGkzbJoXKRxXRDUXMheKbzbil//PHQg=; b=KQTIqoFdqaitsf2gQjeiczdMPlK30sdKhWwiwdy7R0iSSqf3QVniCYSiJdPREsJ8ez AC6Z4G0vr9aaTRyWSGh/Zb4tsiW1armBwxWkiF588JYKSpRiAd+O521akXwEr/5oborI 1qyG/ttgorj2hDDw1Vv0sX2OE7twvetCgKfMoQ0PIz+6nn4jrLUCGMRaJ0R4Kv57Dq8J uOtekzESyKYxib/lv5WM9VovIO5nFI0s/z88sWT/7jDabUMr6uH4QZ0NXDhfUvXF7YvS 569V1g7Dp6TK0W+xDmJIMcrLbisKXLLlHX8rXAs9wiRrfLARykqMBDYMAOPwpX7aY7ns Jt6A== X-Gm-Message-State: AOAM530/oEe55fBbYgmJCHgxS85l2NrIjiSnQ8gT8rj0lBYpRJhcAwFs iPH+6d4ufvwm2W7qiIGzVeAH5yIaZGxT2ZC3ZaYYnFTvAamdgzJJcH0nml+dre7P5EsxCPpAOKk 1TIZBBMG6882b1RSzO1zrrP3gWGoTNQerXcB17Vk5ewfyTaoRV2K/nMGdBAw2vG7rOAFSSOE= X-Google-Smtp-Source: ABdhPJwrYeWl61WHA38A9jmzHInV6cxcfipLjmZj1KLlqp1UGGSX9J+5WpDU/4bXJ6sUiarSd8kq/e+QbjVzVw== X-Received: by 2002:adf:ed02:: with SMTP id a2mr25805826wro.110.1593600872421; Wed, 01 Jul 2020 03:54:32 -0700 (PDT) Date: Wed, 1 Jul 2020 11:54:26 +0100 Message-Id: <20200701105426.2496866-1-gprocida@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.27.0.212.ge8ba1cc988-goog Subject: [PATCH] abg-comparison.cc: Tidy some corpus_diff code To: libabigail@sourceware.org X-Spam-Status: No, score=-24.1 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: Giuliano Procida via Libabigail From: Giuliano Procida Reply-To: Giuliano Procida Cc: kernel-team@android.com Errors-To: libabigail-bounces@sourceware.org Sender: "Libabigail" This commit fixes up some code whitespace for style and consitency, renames a poorly-named variable and fixes a comment typo. There are no behavioural changes. * src/abg-comparison.cc (corpus_diff::priv::emit_diff_stats): Adjust code whitespace; rename the second instance of total_nb_variable_changes to total_nb_unreachable_type_changes. (corpus_diff::has_incompatible_changes): Fix comment typo. Signed-off-by: Giuliano Procida Reviewed-by: Matthias Maennich --- src/abg-comparison.cc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/abg-comparison.cc b/src/abg-comparison.cc index 88f0bdeb..e4b86426 100644 --- a/src/abg-comparison.cc +++ b/src/abg-comparison.cc @@ -10099,7 +10099,6 @@ corpus_diff::priv::emit_diff_stats(const diff_stats& s, out << " (" << num_filtered << " filtered out)"; out << "\n"; - out << indent << "Changed leaf types summary: " << s.net_num_leaf_type_changes(); if (s.num_leaf_type_changes_filtered_out()) @@ -10137,7 +10136,6 @@ corpus_diff::priv::emit_diff_stats(const diff_stats& s, // variables changes summary out << indent << "Removed/Changed/Added variables summary: "; - out << s.net_num_vars_removed() << " Removed"; if (s.num_removed_vars_filtered_out()) out << " (" << s.num_removed_vars_filtered_out() @@ -10180,7 +10178,7 @@ corpus_diff::priv::emit_diff_stats(const diff_stats& s, out << " (" << s.num_changed_func_filtered_out() << " filtered out)"; out << ", "; - out << s.net_num_func_added()<< " Added"; + out << s.net_num_func_added() << " Added"; if (s.num_added_func_filtered_out()) out << " (" << s.num_added_func_filtered_out() << " filtered out)"; if (total_nb_function_changes <= 1) @@ -10194,7 +10192,6 @@ corpus_diff::priv::emit_diff_stats(const diff_stats& s, + s.num_vars_changed() + s.num_vars_added(); out << indent << "Variables changes summary: "; - out << s.net_num_vars_removed() << " Removed"; if (s.num_removed_vars_filtered_out()) out << " (" << s.num_removed_vars_filtered_out() @@ -10221,7 +10218,7 @@ corpus_diff::priv::emit_diff_stats(const diff_stats& s, // functions/variables. if (ctxt->show_unreachable_types()) { - size_t total_nb_variable_changes = + size_t total_nb_unreachable_type_changes = s.num_removed_unreachable_types() + s.num_changed_unreachable_types() + s.num_added_unreachable_types(); @@ -10247,7 +10244,7 @@ corpus_diff::priv::emit_diff_stats(const diff_stats& s, if (s.num_added_unreachable_types_filtered_out()) out << " (" << s.num_added_unreachable_types_filtered_out() << " filtered out)"; - if (total_nb_variable_changes <= 1) + if (total_nb_unreachable_type_changes <= 1) out << " type"; else out << " types"; @@ -10808,7 +10805,7 @@ corpus_diff::has_incompatible_changes() const || stats.net_num_func_removed() != 0 || (stats.num_func_with_virtual_offset_changes() != 0 // If all reports about functions with sub-type changes - // have been suppressd, then even those about functions + // have been suppressed, then even those about functions // that are virtual don't matter anymore because the // user willingly requested to shut them down && stats.net_num_func_changed() != 0)