From patchwork Sun Jul 9 17:01:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 72393 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 E84CA3858C2C for ; Sun, 9 Jul 2023 17:02:42 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from progateway7-pub.mail.pro1.eigbox.com (gproxy5-pub.mail.unifiedlayer.com [67.222.38.55]) by sourceware.org (Postfix) with ESMTPS id 9B67D3858409 for ; Sun, 9 Jul 2023 17:01:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9B67D3858409 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw15.mail.unifiedlayer.com (unknown [10.0.90.130]) by progateway7.mail.pro1.eigbox.com (Postfix) with ESMTP id D7C0110047418 for ; Sun, 9 Jul 2023 17:01:49 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id IXnBqeK0uSPQoIXnBqCqvN; Sun, 09 Jul 2023 17:01:49 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=YNRadTKx c=1 sm=1 tr=0 ts=64aae7fd a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10:nop_charset_1 a=ws7JD89P4LkA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=w3fqXnBjIZip1TvppMgA:9 a=QEXdDO2ut3YA:10:nop_charset_2 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=0F8w9B/rlG+R3xurZc7SeDrlJOZ/8yhMZTNdL/2TXzw=; b=CL0d6cl+kLIvOt8HZgy3c9Fa6O 3/S3KVRr/bVjRFHz2V/X7GsljcbFFrUQjZdetV9f6bSuBKERc/nZP/T96E4CtOJMb7Gi1spufUBj9 3qAydrom3tpuIYl6OtH+fTVPr; Received: from 75-166-135-140.hlrn.qwest.net ([75.166.135.140]:52250 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1qIXnB-001oeb-1k for gdb-patches@sourceware.org; Sun, 09 Jul 2023 11:01:49 -0600 From: Tom Tromey Date: Sun, 09 Jul 2023 11:01:54 -0600 Subject: [PATCH 8/8] Change 'handle_id' to be a local variable MIME-Version: 1.0 Message-Id: <20230709-trace-cleanups-v1-8-c410e1072fab@tromey.com> References: <20230709-trace-cleanups-v1-0-c410e1072fab@tromey.com> In-Reply-To: <20230709-trace-cleanups-v1-0-c410e1072fab@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.3 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 75.166.135.140 X-Source-L: No X-Exim-ID: 1qIXnB-001oeb-1k X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-135-140.hlrn.qwest.net ([192.168.0.21]) [75.166.135.140]:52250 X-Source-Auth: tom+tromey.com X-Email-Count: 9 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3025.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 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 Sender: "Gdb-patches" The global variable 'handle_id' in tracectf.c is only used in a single function, so change it to be a local variable. --- gdb/tracectf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gdb/tracectf.c b/gdb/tracectf.c index c2b55426b41..0ed2092c32b 100644 --- a/gdb/tracectf.c +++ b/gdb/tracectf.c @@ -855,7 +855,6 @@ class ctf_target final : public tracefile_target }; /* The struct pointer for current CTF directory. */ -static int handle_id = -1; static struct bt_context *ctx = NULL; static struct bt_ctf_iter *ctf_iter = NULL; /* The position of the first packet containing trace frame. */ @@ -895,7 +894,7 @@ ctf_open_dir (const char *dirname) ctx = bt_context_create (); if (ctx == NULL) error (_("Unable to create bt_context")); - handle_id = bt_context_add_trace (ctx, dirname, "ctf", NULL, NULL, NULL); + int handle_id = bt_context_add_trace (ctx, dirname, "ctf", NULL, NULL, NULL); if (handle_id < 0) { ctf_destroy ();