From patchwork Wed Jul 1 10:54:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Procida X-Patchwork-Id: 39856 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 BEE4E3857007; Wed, 1 Jul 2020 10:54:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BEE4E3857007 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1593600854; bh=878DmT+gPc7ffNPRWJcMYtfOS6Z3303jW0Ypp1khvCc=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:Cc:From; b=OhflJbPQaaTLmSRzi7ZTNBsRFZa6TileIFiPWMD9XJfOPa0U75fLAc2z0qKpw+w7P T2zfRE0eFGaSl9lioXFpDD8lUaOrg2OTgnCr7rb/swf7ju1TTbMCY5zrrFe6sl20uH XbaFNtBxUfF0wyH4X0kPjnKLPBfk7noX7O6sbr0s= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-qk1-x74a.google.com (mail-qk1-x74a.google.com [IPv6:2607:f8b0:4864:20::74a]) by sourceware.org (Postfix) with ESMTPS id 9943C3857007 for ; Wed, 1 Jul 2020 10:54:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9943C3857007 Received: by mail-qk1-x74a.google.com with SMTP id p126so616811qkf.15 for ; Wed, 01 Jul 2020 03:54:11 -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=878DmT+gPc7ffNPRWJcMYtfOS6Z3303jW0Ypp1khvCc=; b=R+LTRd8rGe/Knp/Kw+7tKNKDi1vSwLlDCPZxWWp96cEdxcZOj6+eAlZK+++HELVPAb xhKVVhBtD3pFqmpGBwuKc00GjaUpmLAicVIJEPN4G0klsG6qPKIHivZ/yRuNNTEk3gtJ 8UN5hvPzxG0waEAIbf/so8FfXH1mPGQBB0ICXfoRIjQo6scyAhFzL3eyZ6pZexLAgoIC +05scBCwXvNbEdMYXXhxkdd/v/aTmqTY0rsQjUXvkjEX9II6Q4ezXPCqcnYtFMraWEdD MltkWKAhGXA8kJTtIlcgTebl8WqLdxM681Sy9a9zkp08STTbqo5T9puBs8z5aA2vFwbt DGAA== X-Gm-Message-State: AOAM532SYtHLBULK1S6jaLH5983ycpJVD4dZ1QXtK278QJdfScz5r4/f 84q4qwRqi5cybO2Jqda5a38MQvqJmVDdaUYZwiumCuFKOp8Jd/bNhGAhmZCd10y8Gs6IaEf1p2F c2ewlGe+pXNgdBA+j/SmlydHPgmqzX7ykN9atAznqPknlnJOYdWKi4W1lVce4h+ww3CQZY1k= X-Google-Smtp-Source: ABdhPJwRbmbgdnb3PSuEch13YkjmaN+M5r6l8mdW9PfMlrsKSU+gow/RvijtGUi5jRTUFBP7VGMY1XV9xkCWKw== X-Received: by 2002:a0c:d7d0:: with SMTP id g16mr20096493qvj.190.1593600851080; Wed, 01 Jul 2020 03:54:11 -0700 (PDT) Date: Wed, 1 Jul 2020 11:54:03 +0100 Message-Id: <20200701105403.2495648-1-gprocida@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.27.0.212.ge8ba1cc988-goog Subject: [PATCH] abidiff: Fix report whitespace typos. To: libabigail@sourceware.org X-Spam-Status: No, score=-23.6 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" The patch fixes two minor formatting typos. * src/abg-reporter-priv.cc (represent): Add missing space to string split across two lines in certain anonymous data member diifs. * src/abg-default-reporter.cc (report): In the array_diff overload, eliminate trailing space at end of line. * tests/data/test-diff-dwarf/test10-report.txt: Delete trailing whitespace. * tests/data/test-diff-filter/test24-compatible-vars-report-1.txt: Ditto. * tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt: Ditto. * tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt: Ditto. * tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt: Ditto. Signed-off-by: Giuliano Procida Signed-off-by: Giuliano Procida Signed-off-by: Dodji Seketeli --- src/abg-default-reporter.cc | 2 +- src/abg-reporter-priv.cc | 2 +- tests/data/test-diff-dwarf/test10-report.txt | 2 +- .../test-diff-filter/test24-compatible-vars-report-1.txt | 2 +- ...6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt | 2 +- ...4-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt | 2 +- ...fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/abg-default-reporter.cc b/src/abg-default-reporter.cc index 2acb6954..69941e5f 100644 --- a/src/abg-default-reporter.cc +++ b/src/abg-default-reporter.cc @@ -632,7 +632,7 @@ default_reporter::report(const array_diff& d, ostream& out, string fn = ir::get_pretty_representation(is_type(dif->first_subject())); // report array element type changes out << indent << "array element type '" - << fn << "' changed: \n"; + << fn << "' changed:\n"; dif->report(out, indent + " "); } diff --git a/src/abg-reporter-priv.cc b/src/abg-reporter-priv.cc index 9f2c5a4a..ef925608 100644 --- a/src/abg-reporter-priv.cc +++ b/src/abg-reporter-priv.cc @@ -470,7 +470,7 @@ represent(const var_diff_sptr &diff, out << indent << "while looking at anonymous data member '" << o_pretty_representation << "':\n" << indent << "the internal name of that anonymous data member" - "changed from:\n" + " changed from:\n" << indent << " " << get_type_name(o_type) << "\n" << indent << "to:\n" << indent << " " << get_type_name(n_type) << "\n" diff --git a/tests/data/test-diff-dwarf/test10-report.txt b/tests/data/test-diff-dwarf/test10-report.txt index ea561e89..52786b54 100644 --- a/tests/data/test-diff-dwarf/test10-report.txt +++ b/tests/data/test-diff-dwarf/test10-report.txt @@ -13,7 +13,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable array type size changed from 480 to 640 array type subrange 2 changed length from 3 to 4 type of 'int* S::m1[10]' changed: - array element type 'int*' changed: + array element type 'int*' changed: in pointed to type 'int': type name changed from 'int' to 'char' type size changed from 32 to 8 (in bits) diff --git a/tests/data/test-diff-filter/test24-compatible-vars-report-1.txt b/tests/data/test-diff-filter/test24-compatible-vars-report-1.txt index d370eefd..49e33b0b 100644 --- a/tests/data/test-diff-filter/test24-compatible-vars-report-1.txt +++ b/tests/data/test-diff-filter/test24-compatible-vars-report-1.txt @@ -5,7 +5,7 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable [C] 'S a[2]' was changed to 'typedef_of_S a[2]': type of variable changed: - array element type 'struct S' changed: + array element type 'struct S' changed: entity changed from 'struct S' to compatible type 'typedef typedef_of_S' type name changed from 'S[2]' to 'typedef_of_S[2]' type size hasn't changed diff --git a/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt b/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt index 487c672c..61b03335 100644 --- a/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt +++ b/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt @@ -86,7 +86,7 @@ [C] 'char* _IceAuthNames[1]' was changed to 'const char* _IceAuthNames[1]' at globals.h:37:1: type of variable changed: - array element type 'char*' changed: + array element type 'char*' changed: in pointed to type 'char': entity changed from 'char' to 'const char' type size hasn't changed diff --git a/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt b/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt index 929f43a3..cba145c5 100644 --- a/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt +++ b/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt @@ -20,7 +20,7 @@ type size hasn't changed 1 data member change: type of 'cdio_dvd_layer_t cdio_dvd_physical::layer[4]' changed: - array element type 'typedef cdio_dvd_layer_t' changed: + array element type 'typedef cdio_dvd_layer_t' changed: underlying type 'struct cdio_dvd_layer' at dvd.h:65:1 changed: type size hasn't changed 8 data member changes: diff --git a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt index 62785044..ba49f8ad 100644 --- a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt +++ b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt @@ -42,7 +42,7 @@ 1 data member change: 'tbb::spin_mutex tbb::internal::concurrent_monitor::mutex_ec' offset changed from 0 to 8 (in bits) (by +8 bits) type of 'tbb::internal::micro_queue tbb::internal::concurrent_queue_rep::array[8]' changed: - array element type 'struct tbb::internal::micro_queue' changed: + array element type 'struct tbb::internal::micro_queue' changed: type size hasn't changed 1 data member change: type of 'tbb::spin_mutex tbb::internal::micro_queue::page_mutex' changed: @@ -96,7 +96,7 @@ struct tbb::internal::padded at tbb_stddef.h:251:1 1 data member change: type of 'tbb::internal::arena_slot tbb::internal::arena::my_slots[1]' changed: - array element type 'struct tbb::internal::arena_slot' changed: + array element type 'struct tbb::internal::arena_slot' changed: type size hasn't changed 2 base class deletions: struct tbb::internal::padded at tbb_stddef.h:261:1 @@ -154,7 +154,7 @@ 'intptr_t tbb::internal::market::my_global_bottom_priority' offset changed from 448 to 512 (in bits) (by +64 bits) 'uintptr_t tbb::internal::market::my_global_reload_epoch' offset changed from 512 to 576 (in bits) (by +64 bits) type of 'tbb::internal::market::priority_level_info tbb::internal::market::my_priority_levels[3]' changed: - array element type 'struct tbb::internal::market::priority_level_info' changed: + array element type 'struct tbb::internal::market::priority_level_info' changed: type size hasn't changed 1 data member change: type of 'tbb::internal::intrusive_list_base, tbb::internal::arena>::iterator tbb::internal::market::priority_level_info::next_arena' changed: