From 2b4ff3c6cfc49f5206db38238e352ed1c9da62a1 Mon Sep 17 00:00:00 2001 From: Giuliano Procida Date: Fri, 5 Jun 2020 12:47:54 +0100 Subject: [PATCH] Fix HARMLESS_SYMBOL_ALIAS_CHANGE_CATEGORY spelling 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 --- include/abg-comparison.h | 4 ++-- src/abg-comp-filter.cc | 2 +- src/abg-comparison.cc | 8 ++++---- tools/abicompat.cc | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/abg-comparison.h b/include/abg-comparison.h index bb510a18..51a78d29 100644 --- a/include/abg-comparison.h +++ b/include/abg-comparison.h @@ -382,7 +382,7 @@ enum diff_category /// This means that a diff node in the sub-tree carries an a symbol /// 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 /// union change. @@ -459,7 +459,7 @@ enum diff_category | NON_VIRT_MEM_FUN_CHANGE_CATEGORY | STATIC_DATA_MEMBER_CHANGE_CATEGORY | HARMLESS_ENUM_CHANGE_CATEGORY - | HARMLESS_SYMBOL_ALIAS_CHANGE_CATEORY + | HARMLESS_SYMBOL_ALIAS_CHANGE_CATEGORY | HARMLESS_UNION_CHANGE_CATEGORY | HARMLESS_DATA_MEMBER_CHANGE_CATEGORY | SUPPRESSED_CATEGORY diff --git a/src/abg-comp-filter.cc b/src/abg-comp-filter.cc index 67c2a180..5f9dd6fe 100644 --- a/src/abg-comp-filter.cc +++ b/src/abg-comp-filter.cc @@ -1549,7 +1549,7 @@ categorize_harmless_diff_node(diff *d, bool pre) category |= HARMLESS_ENUM_CHANGE_CATEGORY; 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)) category |= FN_PARM_TYPE_TOP_CV_CHANGE_CATEGORY; diff --git a/src/abg-comparison.cc b/src/abg-comparison.cc index 7305a71a..5797c9dd 100644 --- a/src/abg-comparison.cc +++ b/src/abg-comparison.cc @@ -2954,7 +2954,7 @@ get_default_harmless_categories_bitmap() | abigail::comparison::NON_VIRT_MEM_FUN_CHANGE_CATEGORY | abigail::comparison::STATIC_DATA_MEMBER_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_DATA_MEMBER_CHANGE_CATEGORY | abigail::comparison::CLASS_DECL_ONLY_DEF_CHANGE_CATEGORY @@ -3052,11 +3052,11 @@ operator<<(ostream& o, diff_category c) emitted_a_category |= true; } - if (c & HARMLESS_SYMBOL_ALIAS_CHANGE_CATEORY) + if (c & HARMLESS_SYMBOL_ALIAS_CHANGE_CATEGORY) { if (emitted_a_category) o << "|"; - o << "HARMLESS_SYMBOL_ALIAS_CHANGE_CATEORY"; + o << "HARMLESS_SYMBOL_ALIAS_CHANGE_CATEGORY"; emitted_a_category |= true; } @@ -3064,7 +3064,7 @@ operator<<(ostream& o, diff_category c) { if (emitted_a_category) o << "|"; - o << "HARMLESS_UNION_CHANGE_CATEORY"; + o << "HARMLESS_UNION_CHANGE_CATEGORY"; emitted_a_category |= true; } diff --git a/tools/abicompat.cc b/tools/abicompat.cc index 78154bf1..a5c707d7 100644 --- a/tools/abicompat.cc +++ b/tools/abicompat.cc @@ -289,7 +289,7 @@ create_diff_context(const options& opts) | abigail::comparison::NON_VIRT_MEM_FUN_CHANGE_CATEGORY | abigail::comparison::STATIC_DATA_MEMBER_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. suppressions_type supprs;