From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by sourceware.org (Postfix) with ESMTPS id DF69F385DC26 for ; Thu, 30 Apr 2020 21:32:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org DF69F385DC26 Received: by mail-wr1-x443.google.com with SMTP id d15so9128690wrx.3 for ; Thu, 30 Apr 2020 14:32:40 -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:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=jUeWBLVMsAjBLmrLeVz8jsK+cxl2wzqybj3SaGBfAs0=; b=S4wLs2MNH+6MMZoVTcTUN4pHkkJTHWMfMJVE+SJoAj/iCLLwDhXmeAmShpHzWihJEd UHArUsbvW5DnH/kwj1MSdjEvxDfWgVhjHwJKqe8RIi9YfT3kf9MSufm3NTskoE37z5PX IxwEzssVw2cOz4tMh0IPt1EY8U2jmaD/+EsC+JjGes9LKf71wMLNei1UFrr41BGaXOb3 2NnFOJaXAUoXuXZkxjuqPiyqEpywXfD6SdLGetHSsxTs7w21qWpWWI22vadZ+cyESwe8 dS8ge+dT3zpDOccHprpgSV/fvupbjOhz59S4tsxxuNc4kbeQIjRrsxLCbR64YB2TU/fm TjFQ== X-Gm-Message-State: AGi0PuZg1uh4dLeAHiaU3gH0gjPnPNDB0N9SXAMQulSoeC0BrUAZoCWI FpQyLycP5+9CYeoJmFBAoloXGA== X-Google-Smtp-Source: APiQypJt/h8DmmI98C3VAQkVz4HDoLQ43p9LbnPL+7ZTpjHQX4S7tOZielrGR00ndPjES47AZMp7mw== X-Received: by 2002:a05:6000:1008:: with SMTP id a8mr609923wrx.189.1588282359458; Thu, 30 Apr 2020 14:32:39 -0700 (PDT) Received: from google.com ([2a00:79e0:d:210:e8f7:125b:61e9:733d]) by smtp.gmail.com with ESMTPSA id s17sm1185257wmc.48.2020.04.30.14.32.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Apr 2020 14:32:37 -0700 (PDT) Date: Thu, 30 Apr 2020 23:32:36 +0200 From: Matthias Maennich To: Giuliano Procida Cc: libabigail@sourceware.org, dodji@seketeli.org, kernel-team@android.com Subject: Re: [PATCH 3/6] Remove stray semicolons. Message-ID: <20200430213236.GA175136@google.com> References: <20200429175133.19814-1-gprocida@google.com> <20200429175133.19814-4-gprocida@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20200429175133.19814-4-gprocida@google.com> X-Spam-Status: No, score=-41.4 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, ENV_AND_HDR_SPF_MATCH, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL, USER_IN_DEF_SPF_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: Libabigail mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Apr 2020 21:32:48 -0000 On Wed, Apr 29, 2020 at 06:51:30PM +0100, Android Kernel Team wrote: >This patch removes various stray semicolons. > > * include/abg-diff-utils.h (display_edit_script): Remove > redundant semicolon. > * include/abg-fwd.h (lookup_basic_type): Ditto. > * src/abg-comparison.cc (mark_diff_as_visited): > Ditto. (array_diff::has_local_changes): Ditto. > (class_diff::ensure_lookup_tables_populated): Ditto. > * src/abg-corpus.cc > (corpus::priv::build_unreferenced_symbols_tables): Ditto. > * src/abg-default-reporter.cc (default_reporter::report): > Ditto. > * src/abg-dwarf-reader.cc (finish_member_function_reading): > Ditto. > * src/abg-ir.cc (is_compatible_with_class_type): Ditto. > (enum_type_decl::enumerator::set_name): Ditto. > * src/abg-reader.cc (read_corpus_from_input): Ditto. > (build_function_type): Ditto. > * src/abg-suppression.cc (type_suppression::suppresses_type): > Ditto. > >Signed-off-by: Giuliano Procida >--- > include/abg-diff-utils.h | 2 +- > include/abg-fwd.h | 2 +- > src/abg-comparison.cc | 6 +++--- > src/abg-corpus.cc | 2 +- > src/abg-default-reporter.cc | 2 +- > src/abg-dwarf-reader.cc | 3 +-- > src/abg-ir.cc | 4 ++-- > src/abg-reader.cc | 4 ++-- > src/abg-suppression.cc | 4 ++-- > 9 files changed, 14 insertions(+), 15 deletions(-) > >diff --git a/include/abg-diff-utils.h b/include/abg-diff-utils.h >index 92171a4a..3cbdbf33 100644 >--- a/include/abg-diff-utils.h >+++ b/include/abg-diff-utils.h >@@ -2046,7 +2046,7 @@ display_edit_script(const edit_script& es, > else if (es.num_deletions() == 1) > { > out << "1 deletion:\n" >- << "\t happened at index: ";; >+ << "\t happened at index: "; > } > else > { >diff --git a/include/abg-fwd.h b/include/abg-fwd.h >index 1aab70a6..c44d0f5d 100644 >--- a/include/abg-fwd.h >+++ b/include/abg-fwd.h >@@ -993,7 +993,7 @@ type_decl_sptr > lookup_basic_type(const string&, const translation_unit&); > > type_decl_sptr >-lookup_basic_type(const type_decl&, const corpus&);; >+lookup_basic_type(const type_decl&, const corpus&); > > type_decl_sptr > lookup_basic_type(const string&, const corpus&); >diff --git a/src/abg-comparison.cc b/src/abg-comparison.cc >index 46bf9e30..399c4b96 100644 >--- a/src/abg-comparison.cc >+++ b/src/abg-comparison.cc >@@ -1320,7 +1320,7 @@ diff_context::mark_diff_as_visited(const diff* d) > ABG_ASSERT(canonical); > > size_t canonical_ptr_value = reinterpret_cast(canonical); >- size_t diff_ptr_value = reinterpret_cast(d);; >+ size_t diff_ptr_value = reinterpret_cast(d); > priv_->visited_diff_nodes_[canonical_ptr_value] = diff_ptr_value; > } > >@@ -3676,7 +3676,7 @@ array_diff::has_local_changes() const > ir::change_kind k = ir::NO_CHANGE_KIND; > if (!equals(*first_array(), *second_array(), &k)) > return k & ir::ALL_LOCAL_CHANGES_MASK; >- return ir::NO_CHANGE_KIND;; >+ return ir::NO_CHANGE_KIND; > } > > /// Report the diff in a serialized form. >@@ -5204,7 +5204,7 @@ class_diff::ensure_lookup_tables_populated(void) const > > vector to_delete; > corpus_sptr f = context()->get_first_corpus(), >- s = context()->get_second_corpus();; >+ s = context()->get_second_corpus(); > if (s) > for (string_member_function_sptr_map::const_iterator i = > deleted_member_fns().begin(); >diff --git a/src/abg-corpus.cc b/src/abg-corpus.cc >index 12f44fd1..ebdf8f29 100644 >--- a/src/abg-corpus.cc >+++ b/src/abg-corpus.cc >@@ -416,7 +416,7 @@ corpus::priv::build_unreferenced_symbols_tables() > string sym_id = (*s)->get_id_string(); > if (refed_vars.find(sym_id) == refed_vars.end()) > { >- bool keep = sym_id_vars_to_keep.empty() ? true : false;; >+ bool keep = sym_id_vars_to_keep.empty() ? true : false; Ehm, can we clean this up along with this patch? bool = bool ? true : false .... > for (vector::const_iterator i = > sym_id_vars_to_keep.begin(); > i != sym_id_vars_to_keep.end(); >diff --git a/src/abg-default-reporter.cc b/src/abg-default-reporter.cc >index 04e2bb76..5892bec2 100644 >--- a/src/abg-default-reporter.cc >+++ b/src/abg-default-reporter.cc >@@ -1713,7 +1713,7 @@ default_reporter::report(const corpus_diff& d, ostream& out, > << c->get_pretty_representation() > << "\n"; > } >- emitted = true;; >+ emitted = true; > } > if (emitted) > out << "\n"; >diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc >index fe369fcf..8da5749d 100644 >--- a/src/abg-dwarf-reader.cc >+++ b/src/abg-dwarf-reader.cc >@@ -13548,8 +13548,7 @@ finish_member_function_reading(Dwarf_Die* die, > if (!f->get_parameters().empty()) > first_parm = f->get_parameters()[0]; > >- bool is_artificial = >- first_parm && first_parm->get_is_artificial();; >+ bool is_artificial = first_parm && first_parm->get_is_artificial(); > pointer_type_def_sptr this_ptr_type; > type_base_sptr other_klass; > >diff --git a/src/abg-ir.cc b/src/abg-ir.cc >index 27831352..bfcaf5d3 100644 >--- a/src/abg-ir.cc >+++ b/src/abg-ir.cc >@@ -7711,7 +7711,7 @@ is_compatible_with_class_type(const type_base_sptr& t) > // CPU usage toll in exchange for finer filtering? > > // type_base_sptr ty = strip_typedef(t); >- type_base_sptr ty = peel_typedef_type(t);; >+ type_base_sptr ty = peel_typedef_type(t); > return is_class_type(ty); > } > >@@ -15203,7 +15203,7 @@ enum_type_decl::enumerator::set_name(const string& n) > { > const environment* env = get_environment(); > ABG_ASSERT(env); >- priv_->name_ = env->intern(n);; >+ priv_->name_ = env->intern(n); > } > > /// Getter for the value of @ref enum_type_decl::enumerator. >diff --git a/src/abg-reader.cc b/src/abg-reader.cc >index 3727e044..4e303c80 100644 >--- a/src/abg-reader.cc >+++ b/src/abg-reader.cc >@@ -2064,7 +2064,7 @@ read_corpus_from_input(read_context& ctxt) > ctxt.set_corpus_node(node); > } > >- return ctxt.get_corpus();; >+ return ctxt.get_corpus(); > } > > /// Parse the input XML document containing an ABI corpus group, >@@ -3840,7 +3840,7 @@ build_function_type(read_context& ctxt, > environment* env = ctxt.get_environment(); > ABG_ASSERT(env); > std::vector > parms; >- type_base_sptr return_type = env->get_void_type();; >+ type_base_sptr return_type = env->get_void_type(); > > class_decl_sptr method_class_type; > if (is_method_t) >diff --git a/src/abg-suppression.cc b/src/abg-suppression.cc >index d9279c15..ab67f40a 100644 >--- a/src/abg-suppression.cc >+++ b/src/abg-suppression.cc >@@ -1159,10 +1159,10 @@ bool > type_suppression::suppresses_type(const type_base_sptr& type) const > { > if (!suppression_matches_type_no_name(*this, type)) >- return false;; >+ return false; > > if (!suppression_matches_type_name(*this, get_name(type))) >- return false;; >+ return false; > > return true; > } >-- >2.26.2.303.gf8c07b1a785-goog > >