From patchwork Mon Mar 10 15:10:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 107590 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 B75163858CDB for ; Mon, 10 Mar 2025 15:31:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B75163858CDB Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=polymtl.ca header.i=@polymtl.ca header.a=rsa-sha256 header.s=default header.b=aENWcwuj X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id DAAF93858D20 for ; Mon, 10 Mar 2025 15:30:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DAAF93858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=polymtl.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=polymtl.ca ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DAAF93858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=132.207.4.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1741620655; cv=none; b=sI4/bc0bC3ZgezaZcywghc9NuxWQ7gQV8DvidRTpMoReAvPMMwXxQOSj2fjBa8UogFcd4e7QOT5sxP22tYtfpNvXx+/AuVfzWZsur0S9rH1jl7J4kWMUBEd5z7RmdUnME3k4N1wHmsfylh5oepC3SLXF4Lmi0w5RgPq87htCsS8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1741620655; c=relaxed/simple; bh=m6Ewi6VStFIr6ELWZlSG8+YNX6i5XRJWpss2tecI/rE=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=ZLO2SuaUXmnU7MZ54aXSlyHIqfVmnLSPV2dCO3QBBWv8jasDFWY9pvbKHXfaZ4WwtzQz6cRCRR8q8vFqfSSQPnNs/R2i0I7YP4Tq8QZDD+GTUzfdCePArHuHo4sRaowxCJOEf88D5uiuV8RynPtwREHlu7tzW4wWUSMHsUlbdPI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DAAF93858D20 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 52AFUoYq000372 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 10 Mar 2025 11:30:55 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 52AFUoYq000372 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1741620655; bh=rN4NpabL7v9xTlJ1qc6v/DQv8hfFw56P0by+/CTUPQY=; h=From:To:Cc:Subject:Date:In-Reply-To:From; b=aENWcwujMYtieYmtSruvUF83CisyQ9ePUT5pXRftFvCSUXqMR0Dx0w0pNTh3yzkCu 06shoxB76X814sjO24a15IcvqwNgiZGFnCUVCuL86USvFVbOKClQWAjUU1cN+zSPI6 j5wnbT/nFZDAbSXvg2CsNFD8skxH8FRTq0el10DA= Received: by simark.ca (Postfix, from userid 112) id 85F2A1E11F; Mon, 10 Mar 2025 11:12:15 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-Spam-Level: X-Spam-Status: No, score=-3187.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 Received: from simark.localdomain (modemcable238.237-201-24.mc.videotron.ca [24.201.237.238]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 121751E0FE; Mon, 10 Mar 2025 11:12:12 -0400 (EDT) From: simon.marchi@polymtl.ca To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 1/4] gdb: C++-ify internal_function Date: Mon, 10 Mar 2025 11:10:46 -0400 Message-ID: <20250310151211.2708331-2-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310151211.2708331-1-simon.marchi@polymtl.ca> References: <20250310151211.2708331-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Mon, 10 Mar 2025 15:30:50 +0000 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org From: Simon Marchi Change the `name` field to std::string, add constructor. Remove function `create_internal_function`, since it becomes a trivial wrapper around the constructor. Change-Id: Ifc8b1282c442e1930bcd69d6e140128067e49563 --- gdb/value.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/gdb/value.c b/gdb/value.c index e498632fe3ca..18c9f7494674 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -55,10 +55,17 @@ /* Definition of a user function. */ struct internal_function { + internal_function (std::string name, internal_function_fn_noside handler, + void *cookie) + : name (std::move (name)), + handler (handler), + cookie (cookie) + {} + /* The name of the function. It is a bit odd to have this in the function itself -- the user might use a differently-named convenience variable to hold the function. */ - char *name; + std::string name; /* The handler. */ internal_function_fn_noside handler; @@ -2316,18 +2323,6 @@ internalvar_name (const struct internalvar *var) return var->name.c_str (); } -static struct internal_function * -create_internal_function (const char *name, - internal_function_fn_noside handler, void *cookie) -{ - struct internal_function *ifn = new (struct internal_function); - - ifn->name = xstrdup (name); - ifn->handler = handler; - ifn->cookie = cookie; - return ifn; -} - const char * value_internal_function_name (struct value *val) { @@ -2338,7 +2333,7 @@ value_internal_function_name (struct value *val) result = get_internalvar_function (VALUE_INTERNALVAR (val), &ifn); gdb_assert (result); - return ifn->name; + return ifn->name.c_str (); } struct value * @@ -2376,7 +2371,7 @@ do_add_internal_function (const char *name, const char *doc, struct internal_function *ifn; struct internalvar *var = lookup_internalvar (name); - ifn = create_internal_function (name, handler, cookie); + ifn = new internal_function (name, handler, cookie); set_internalvar_function (var, ifn); return add_cmd (name, no_class, function_command, doc, &functionlist);