From patchwork Fri Jun 5 11:47:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Procida X-Patchwork-Id: 39480 X-Patchwork-Delegate: dodji@seketeli.org 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 4B5F7385BF81; Fri, 5 Jun 2020 11:48:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4B5F7385BF81 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1591357690; bh=sjFFYrVYj4fXZ6LqSqDNDs/PvQL+Dh48B5p00Kv2Dqs=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:Cc:From; b=jKwitwCGnj7yVV9WuDIQ8Fnp9BWLTIXzyJ8ZeDVXu0Was/ViO+DWnmnc/hVTmKb+7 T22iiv2BcTawwk23e6dw08ZXkkn6MvzbnVuX2UxstThmybp+F3Stsn97NJAZ2njaBZ 7uIRpsaTu76YHHmVyjdcw7H2nw/03Euye6hGfO/Q= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-qt1-x849.google.com (mail-qt1-x849.google.com [IPv6:2607:f8b0:4864:20::849]) by sourceware.org (Postfix) with ESMTPS id 3CC93385DC35 for ; Fri, 5 Jun 2020 11:48:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3CC93385DC35 Received: by mail-qt1-x849.google.com with SMTP id u26so8137004qtj.21 for ; Fri, 05 Jun 2020 04:48:06 -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=sjFFYrVYj4fXZ6LqSqDNDs/PvQL+Dh48B5p00Kv2Dqs=; b=S+psl1IOUn2HFhMsXT0bc7zl3X48ihj6XmKspE+gMitGj9j3hswqctGFqTTzKZ8kgf J/RWV6YQnN/CVe3LVvvj9Z1jM5FXfY4vro//JBVd/RyJnIq9UEnEe10SElpkmDYNsxGP LH16MOBEAy8moP4vYW78siAGu7vOIOoz9CC+AuLvnmFeDjLuQaSaKLodbRnJUaS3sTMI PYsAh7YYJg8c0yPrGeuSGdbaUwSOju/hNLgTD/b5Dv5IkXa9THwC8xEKPV/igEp7xB2G v86ixJUkYAbho/0WSvc2eTCaZthc59E0JfI2Ld2PwQPH268Af23pWlDEsl00dOL51Vsg wYNA== X-Gm-Message-State: AOAM5323/otVezAhcv/xx5JiMNWLMKSnVXKRm08iorW45BC/H2PWzXoi lQ+60E95Bc6DH6a3W0i2oJ3veZfAOZhwLMQ1m5Ke91cYVG/5qvUXDevFHL0a2nBcWwoE33AMyZs ZnMexKkA0wqyAWuRDYLrLVmZJOYxYioibPHQv0JeKrwpzauVsrgTGmLhPk4SLx0dkqiTiW+w= X-Google-Smtp-Source: ABdhPJwyWJcxqojZxzh5NEA38c4E/lJd4GmIjNfRrYcHos64lAK7mfKLDQWYaN5RGK/+QitmlZI02tg8xy23wg== X-Received: by 2002:ad4:4732:: with SMTP id l18mr9552240qvz.43.1591357685606; Fri, 05 Jun 2020 04:48:05 -0700 (PDT) Date: Fri, 5 Jun 2020 12:47:54 +0100 Message-Id: <20200605114754.129211-1-gprocida@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.27.0.278.ge193c7cf3a9-goog Subject: [PATCH] Fix HARMLESS_SYMBOL_ALIAS_CHANGE_CATEGORY spelling To: libabigail@sourceware.org X-Spam-Status: No, score=-22.8 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_STOCKGEN, 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, gprocida@google.com Errors-To: libabigail-bounces@sourceware.org Sender: "Libabigail" 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 Reviewed-by: Matthias Maennich Acked-by: Dodji Seketeli --- 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;