RepoMirrors/libabigail
1
0
Fork 0
mirror of git://sourceware.org/git/libabigail.git synced 2024-12-14 05:54:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix HARMLESS_SYMBOL_ALIAS_CHANGE_CATEGORY spelling

Browse Source 
The enumerator HARMLESS_SYMBOL_ALIAS_CHANGE_CATEORY has a spelling
mistake in it. This changes fixes this and also corrects the spelling
of both this and HARMLESS_UNION_CHANGE_CATEORY when output.

	* include/abg-comparison.h (enum diff_category): Rename
	HARMLESS_SYMBOL_ALIAS_CHANGE_CATEORY enumerator to
	HARMLESS_SYMBOL_ALIAS_CHANGE_CATEGORY.
	* src/abg-comp-filter.cc (categorize_harmless_diff_node): Replace
	use of HARMLESS_SYMBOL_ALIAS_CHANGE_CATEORY enumerator with
	HARMLESS_SYMBOL_ALIAS_CHANGE_CATEGORY.
	* src/abg-comparison.cc (get_default_harmless_categories_bitmap):
	Replace use of HARMLESS_SYMBOL_ALIAS_CHANGE_CATEORY enumerator
	with HARMLESS_SYMBOL_ALIAS_CHANGE_CATEGORY.
	(operator<<): In the diff_category overload, replace use of
	HARMLESS_SYMBOL_ALIAS_CHANGE_CATEORY enumerator with
	HARMLESS_SYMBOL_ALIAS_CHANGE_CATEGORY and output correct
	spelling for both this and HARMLESS_UNION_CHANGE_CATEGORY.
	* tools/abicompat.cc (create_diff_context): Replace use of
	HARMLESS_SYMBOL_ALIAS_CHANGE_CATEORY enumerator with
	HARMLESS_SYMBOL_ALIAS_CHANGE_CATEGORY.

Signed-off-by: Giuliano Procida <gprocida@google.com>
This commit is contained in:
Giuliano Procida 2020-06-05 12:47:54 +01:00 committed by Dodji Seketeli
parent 6ffaef7a92
commit 2b4ff3c6cf
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/abg-comparison.h
View File

@ -382,7 +382,7 @@ enum diff_category
/// This means that a diff node in the sub-tree carries an a symbol /// This means that a diff node in the sub-tree carries an a symbol
/// alias change that is harmless. /// alias change that is harmless.
HARMLESS_SYMBOL_ALIAS_CHANGE_CATEORY = 1 << 6, HARMLESS_SYMBOL_ALIAS_CHANGE_CATEGORY = 1 << 6,
/// This means that a diff node in the sub-tree carries a harmless /// This means that a diff node in the sub-tree carries a harmless
/// union change. /// union change.
@ -459,7 +459,7 @@ enum diff_category
| NON_VIRT_MEM_FUN_CHANGE_CATEGORY | NON_VIRT_MEM_FUN_CHANGE_CATEGORY
| STATIC_DATA_MEMBER_CHANGE_CATEGORY | STATIC_DATA_MEMBER_CHANGE_CATEGORY
| HARMLESS_ENUM_CHANGE_CATEGORY | HARMLESS_ENUM_CHANGE_CATEGORY
| HARMLESS_SYMBOL_ALIAS_CHANGE_CATEORY | HARMLESS_SYMBOL_ALIAS_CHANGE_CATEGORY
| HARMLESS_UNION_CHANGE_CATEGORY | HARMLESS_UNION_CHANGE_CATEGORY
| HARMLESS_DATA_MEMBER_CHANGE_CATEGORY | HARMLESS_DATA_MEMBER_CHANGE_CATEGORY
| SUPPRESSED_CATEGORY | SUPPRESSED_CATEGORY

2
src/abg-comp-filter.cc
View File

@ -1549,7 +1549,7 @@ categorize_harmless_diff_node(diff *d, bool pre)
category |= HARMLESS_ENUM_CHANGE_CATEGORY; category |= HARMLESS_ENUM_CHANGE_CATEGORY;
if (function_name_changed_but_not_symbol(d)) if (function_name_changed_but_not_symbol(d))
category |= HARMLESS_SYMBOL_ALIAS_CHANGE_CATEORY; category |= HARMLESS_SYMBOL_ALIAS_CHANGE_CATEGORY;
if (has_fn_parm_type_top_cv_qual_change(d)) if (has_fn_parm_type_top_cv_qual_change(d))
category |= FN_PARM_TYPE_TOP_CV_CHANGE_CATEGORY; category |= FN_PARM_TYPE_TOP_CV_CHANGE_CATEGORY;

8
src/abg-comparison.cc
View File

@ -2954,7 +2954,7 @@ get_default_harmless_categories_bitmap()
| abigail::comparison::NON_VIRT_MEM_FUN_CHANGE_CATEGORY | abigail::comparison::NON_VIRT_MEM_FUN_CHANGE_CATEGORY
| abigail::comparison::STATIC_DATA_MEMBER_CHANGE_CATEGORY | abigail::comparison::STATIC_DATA_MEMBER_CHANGE_CATEGORY
| abigail::comparison::HARMLESS_ENUM_CHANGE_CATEGORY | abigail::comparison::HARMLESS_ENUM_CHANGE_CATEGORY
| abigail::comparison::HARMLESS_SYMBOL_ALIAS_CHANGE_CATEORY | abigail::comparison::HARMLESS_SYMBOL_ALIAS_CHANGE_CATEGORY
| abigail::comparison::HARMLESS_UNION_CHANGE_CATEGORY | abigail::comparison::HARMLESS_UNION_CHANGE_CATEGORY
| abigail::comparison::HARMLESS_DATA_MEMBER_CHANGE_CATEGORY | abigail::comparison::HARMLESS_DATA_MEMBER_CHANGE_CATEGORY
| abigail::comparison::CLASS_DECL_ONLY_DEF_CHANGE_CATEGORY | abigail::comparison::CLASS_DECL_ONLY_DEF_CHANGE_CATEGORY
@ -3052,11 +3052,11 @@ operator<<(ostream& o, diff_category c)
emitted_a_category |= true; emitted_a_category |= true;
} }
if (c & HARMLESS_SYMBOL_ALIAS_CHANGE_CATEORY) if (c & HARMLESS_SYMBOL_ALIAS_CHANGE_CATEGORY)
{ {
if (emitted_a_category) if (emitted_a_category)
o << "|"; o << "|";
o << "HARMLESS_SYMBOL_ALIAS_CHANGE_CATEORY"; o << "HARMLESS_SYMBOL_ALIAS_CHANGE_CATEGORY";
emitted_a_category |= true; emitted_a_category |= true;
} }
@ -3064,7 +3064,7 @@ operator<<(ostream& o, diff_category c)
{ {
if (emitted_a_category) if (emitted_a_category)
o << "|"; o << "|";
o << "HARMLESS_UNION_CHANGE_CATEORY"; o << "HARMLESS_UNION_CHANGE_CATEGORY";
emitted_a_category |= true; emitted_a_category |= true;
} }

2
tools/abicompat.cc
View File

@ -289,7 +289,7 @@ create_diff_context(const options& opts)
| abigail::comparison::NON_VIRT_MEM_FUN_CHANGE_CATEGORY | abigail::comparison::NON_VIRT_MEM_FUN_CHANGE_CATEGORY
| abigail::comparison::STATIC_DATA_MEMBER_CHANGE_CATEGORY | abigail::comparison::STATIC_DATA_MEMBER_CHANGE_CATEGORY
| abigail::comparison::HARMLESS_ENUM_CHANGE_CATEGORY | abigail::comparison::HARMLESS_ENUM_CHANGE_CATEGORY
| abigail::comparison::HARMLESS_SYMBOL_ALIAS_CHANGE_CATEORY); | abigail::comparison::HARMLESS_SYMBOL_ALIAS_CHANGE_CATEGORY);
// Load suppression specifications, if there are any. // Load suppression specifications, if there are any.
suppressions_type supprs; suppressions_type supprs;