From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 7DFB13858426 for ; Thu, 19 Oct 2023 14:55:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7DFB13858426 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=simark.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=simark.ca ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7DFB13858426 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=158.69.221.121 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697727320; cv=none; b=J0qkeRm8LbEk4faGgsDsY5E3pPSKztTvEFVyryY+KGsPS82692zatkiTnKHFyKCJFdS/gFVy2ahOuX5XHXLF8AiesXxWORFWxB/eRU9FSh1qHbZfbzt+prbV6SnVAg6ZRWY3mg4gZyP1ZYScHBhgNW7ha367RLJ7eIaYc2fqINs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697727320; c=relaxed/simple; bh=bShGhiZ3IgHpNH8sUufNL4ekC35JY1AVLDQi54E3X9c=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=Sp0k1hGIbpYVMWTdjI9MXDMqsmCreBAP8pknb3zC4MgfIvy47qN0KGnCNkI/vGMkTXvfE2ZBzffN1cfZhWCjFc0HF67sJTbt2boDOd6ih/PG4/sIK9y9tOUHdG3Lul9LGzC8ppObLN9OUQUJasBepcjI1IA4y5jyJNo1g31Uj/U= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=simark.ca; s=mail; t=1697727319; bh=bShGhiZ3IgHpNH8sUufNL4ekC35JY1AVLDQi54E3X9c=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=jK8s8eyAbSUKWEXFJsYRkVhCj6Dzr1+LEqBmvTr7+ykCrDhEfoLv5pRlmIAnrd//0 TD3sPR6uZRIRdGUI2Ecrp25PVtWFVFI+R6L2K6VM5g+JG46uRWthsgW9Njp34mogNL HwJUd9lFez0Z/DMillhA4pohsKUywn+noaaRKeW8= Received: from [172.16.0.192] (192-222-143-198.qc.cable.ebox.net [192.222.143.198]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 09BDD1E00F; Thu, 19 Oct 2023 10:55:19 -0400 (EDT) Message-ID: <75299a0b-7635-42fb-9f30-97c2fbfb35e0@simark.ca> Date: Thu, 19 Oct 2023 10:55:18 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 20/24] gdb: make so_list::{so_original_name,so_name} std::strings Content-Language: fr To: Lancelot SIX , Simon Marchi Cc: gdb-patches@sourceware.org References: <20231010204213.111285-1-simon.marchi@efficios.com> <20231010204213.111285-21-simon.marchi@efficios.com> <20231019110839.v4he4o4jw7jnj7i6@khazad-dum> From: Simon Marchi In-Reply-To: <20231019110839.v4he4o4jw7jnj7i6@khazad-dum> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 10/19/23 07:08, Lancelot SIX wrote: > Hi Simon, > > Some other minor NULL -> nullptr possible conversions below. > > On Tue, Oct 10, 2023 at 04:40:15PM -0400, Simon Marchi wrote: >> Change these two fields, simplifying memory management and copying. >> >> Change-Id: If2559284c515721e71e1ef56ada8b64667eebe55 >> --- >> gdb/break-catch-load.c | 2 +- >> gdb/breakpoint.c | 2 +- >> gdb/bsd-uthread.c | 8 +++---- >> gdb/mi/mi-cmd-file.c | 2 +- >> gdb/solib-aix.c | 8 +++---- >> gdb/solib-darwin.c | 5 ++--- >> gdb/solib-dsbt.c | 5 ++--- >> gdb/solib-frv.c | 6 ++---- >> gdb/solib-rocm.c | 8 ++----- >> gdb/solib-svr4.c | 25 ++++++++++------------ >> gdb/solib-target.c | 18 ++++++---------- >> gdb/solib.c | 47 +++++++++++++++++++++++------------------- >> gdb/solist.h | 4 ++-- >> 13 files changed, 63 insertions(+), 77 deletions(-) >> >> diff --git a/gdb/break-catch-load.c b/gdb/break-catch-load.c >> index 94d8b420d327..999de874d5f6 100644 >> --- a/gdb/break-catch-load.c >> +++ b/gdb/break-catch-load.c >> @@ -120,7 +120,7 @@ solib_catchpoint::check_status (struct bpstat *bs) >> for (so_list *iter : current_program_space->added_solibs) >> { >> if (!regex >> - || compiled->exec (iter->so_name, 0, NULL, 0) == 0) >> + || compiled->exec (iter->so_name.c_str (), 0, NULL, 0) == 0) > > While at touching this line, s/NULL/nullptr. > >> return; >> } >> } >> diff --git a/gdb/mi/mi-cmd-file.c b/gdb/mi/mi-cmd-file.c >> index 822d3df40005..5f63ce4494cb 100644 >> --- a/gdb/mi/mi-cmd-file.c >> +++ b/gdb/mi/mi-cmd-file.c >> @@ -167,7 +167,7 @@ mi_cmd_file_list_shared_libraries (const char *command, >> { >> if (so->so_name[0] == '\0') >> continue; >> - if (pattern != NULL && !re_exec (so->so_name)) >> + if (pattern != NULL && !re_exec (so->so_name.c_str ())) > > Same. > >> continue; >> >> ui_out_emit_tuple tuple_emitter (uiout, NULL); >> diff --git a/gdb/solib.c b/gdb/solib.c >> index 6b7f0da0498d..1815b0910208 100644 >> --- a/gdb/solib.c >> +++ b/gdb/solib.c >> @@ -705,9 +708,10 @@ solib_read_symbols (so_list &so, symfile_add_flags flags) >> section_addr_info sap >> = build_section_addr_info_from_section_table (so.sections); >> gdb_bfd_ref_ptr tmp_bfd = so.abfd; >> - so.objfile = symbol_file_add_from_bfd (tmp_bfd, so.so_name, >> - flags, &sap, >> - OBJF_SHARED, NULL); >> + so.objfile = symbol_file_add_from_bfd (tmp_bfd, >> + so.so_name.c_str (), >> + flags, &sap, >> + OBJF_SHARED, NULL); > > Same. Done. Simon