abidiff: Fix report whitespace typos.
Commit Message
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 <gprocida@google.com>
---
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(-)
Comments
Hello,
Giuliano Procida <gprocida@google.com> a écrit:
> 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.
I fixed this typo diifs -> diffs.
> * 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.
It appeared that the reference output file
tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
needed updating as well. So I just did it.
> Signed-off-by: Giuliano Procida <gprocida@google.com>
Applied to master. Thanks!
Please find below the version of the patch that was applied.
Cheers,
From e0d29a919d90a86ace7a3fb30f75c9ff22d413b2 Mon Sep 17 00:00:00 2001
From: Giuliano Procida <gprocida@google.com>
Date: Wed, 1 Jul 2020 11:54:03 +0100
Subject: [PATCH] reporter: Fix report whitespace typos.
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
diffs.
* 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.
* tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt:
Ditto.
Signed-off-by: Giuliano Procida <gprocida@google.com>
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
---
src/abg-default-reporter.cc | 2 +-
src/abg-reporter-priv.cc | 2 +-
tests/data/test-diff-dwarf/test10-report.txt | 2 +-
.../data/test-diff-filter/test24-compatible-vars-report-1.txt | 2 +-
....el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt | 2 +-
...0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt | 2 +-
...erver-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt | 10 +++++-----
...14.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt | 6 +++---
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/abg-default-reporter.cc b/src/abg-default-reporter.cc
index cbf8c2b..2948e15 100644
--- a/src/abg-default-reporter.cc
+++ b/src/abg-default-reporter.cc
@@ -651,7 +651,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 9f2c5a4..ef92560 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 ea561e8..52786b5 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 d370eef..49e33b0 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 487c672..61b0333 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 929f43a..cba145c 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/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
index 6fbcc4b..c1aff1c 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
@@ -318,7 +318,7 @@
entity changed from 'typedef RedDispatcher' to compatible type 'struct RedDispatcher'
details are being reported
type of 'SpiceWatch RedWorker::watches[20]' changed:
- array element type 'struct SpiceWatch' changed:
+ array element type 'struct SpiceWatch' changed:
details are being reported
type size hasn't changed
type of 'MonitorsConfig* RedWorker::monitors_config' changed:
@@ -329,7 +329,7 @@
type of 'RedWorker* MonitorsConfig::worker' changed:
pointed to type 'struct RedWorker' changed, as being reported
type of '_Drawable RedWorker::drawables[1000]' changed:
- array element type 'typedef _Drawable' changed:
+ array element type 'typedef _Drawable' changed:
underlying type 'struct _Drawable' at red_worker.c:874:1 changed:
type size changed from 3200 to 2560 (in bits)
1 data member change:
@@ -364,7 +364,7 @@
type of 'Stream* Drawable::sized_stream' changed:
pointed to type 'typedef Stream' changed at red_worker.c:432:1, as reported earlier
type of 'DependItem Drawable::depend_items[3]' changed:
- array element type 'typedef DependItem' changed:
+ array element type 'typedef DependItem' changed:
underlying type 'struct DependItem' at red_worker.c:825:1 changed:
type size hasn't changed
1 data member change:
@@ -415,7 +415,7 @@
'uint32_t RedWorker::mouse_mode' offset changed from 15445920 to 14805856 (in bits) (by -640064 bits)
'uint32_t RedWorker::streaming_video' offset changed from 15445952 to 14805888 (in bits) (by -640064 bits)
type of 'Stream RedWorker::streams_buf[50]' changed:
- array element type 'typedef Stream' changed:
+ array element type 'typedef Stream' changed:
underlying type 'struct Stream' changed at red_worker.c:433:1, as reported earlier
array type size changed from 44800 to 41600
and offset changed from 15446016 to 14805952 (in bits) (by -640064 bits)
@@ -467,7 +467,7 @@
type of 'EncoderData data' changed:
underlying type 'struct {DisplayChannelClient* dcc; RedCompressBuf* bufs_head; RedCompressBuf* bufs_tail; jmp_buf jmp_env; union {struct {SpiceChunks* chunks; int next; int stride; int reverse;} lines_data; struct {RedCompressBuf* next; int size_left;} compressed_data;} u; char message_buf[512];}' changed, as being reported
type of 'StreamAgent DisplayChannelClient::stream_agents[50]' changed:
- array element type 'typedef StreamAgent' changed:
+ array element type 'typedef StreamAgent' changed:
underlying type 'struct StreamAgent' at red_worker.c:464:1 changed:
type size hasn't changed
2 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 6278504..ba49f8a 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<tbb::internal::arena_base, 128ul> 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<tbb::internal::arena_slot_line1> 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::intrusive_list<tbb::internal::arena>, tbb::internal::arena>::iterator tbb::internal::market::priority_level_info::next_arena' changed:
@@ -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 + " ");
}
@@ -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"
@@ -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)
@@ -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
@@ -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
@@ -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:
@@ -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<tbb::internal::arena_base, 128ul> 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<tbb::internal::arena_slot_line1> 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::intrusive_list<tbb::internal::arena>, tbb::internal::arena>::iterator tbb::internal::market::priority_level_info::next_arena' changed: