From patchwork Tue Oct 10 18:03:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 23428 Received: (qmail 98347 invoked by alias); 10 Oct 2017 18:03:34 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 98337 invoked by uid 89); 10 Oct 2017 18:03:34 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-22.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS, UNWANTED_LANGUAGE_BODY autolearn=ham version=3.3.2 spammy=HX-ClientProxiedBy:2a01, HX-ClientProxiedBy:e400, HX-ClientProxiedBy:111, HX-ClientProxiedBy:10b6 X-HELO: sesbmg22.ericsson.net Received: from sesbmg22.ericsson.net (HELO sesbmg22.ericsson.net) (193.180.251.48) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 10 Oct 2017 18:03:32 +0000 Received: from ESESSHC020.ericsson.se (Unknown_Domain [153.88.183.78]) by sesbmg22.ericsson.net (Symantec Mail Security) with SMTP id DA.DE.13256.17B0DD95; Tue, 10 Oct 2017 20:03:30 +0200 (CEST) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.78) with Microsoft SMTP Server (TLS) id 14.3.352.0; Tue, 10 Oct 2017 20:03:29 +0200 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from elxacz23q12.ca.am.ericsson.se (192.75.88.130) by AM3PR07MB308.eurprd07.prod.outlook.com (2a01:111:e400:881b::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.5; Tue, 10 Oct 2017 18:03:27 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH 1/4] Rename traceframe_info variable to current_traceframe_info Date: Tue, 10 Oct 2017 14:03:10 -0400 Message-ID: <1507658593-28825-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-ClientProxiedBy: SN2PR00CA0038.namprd00.prod.outlook.com (2603:10b6:804:1::48) To AM3PR07MB308.eurprd07.prod.outlook.com (2a01:111:e400:881b::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2d977c8d-e07a-4f2a-5717-08d510093580 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:AM3PR07MB308; X-Microsoft-Exchange-Diagnostics: 1; AM3PR07MB308; 3:OzLNg7eF+/bKnkAx0tNzSf7GCKm+6GrauL+cxMiruQ2WFhtkSQANEKP8G1h0OB++GgiGCstxvMv6dkDQJFylXuS5pbOgnsjGvO4Zdpm19Qzl6PlYoaGO7VivIxIMnMd7sfkNXzz5RuYqOPC0BJvzNTFhBCd/4zgyGoS0o58UtOok2GY+e3Y/HvUCXNwbHYkYb8H3b72buIyksZVgQLHa34shw1wd6kcCPWIMGxt4qxK8g3HBdE5BPbrt/gH4y0ID; 25:E6I8cgDX07ZHpxHa51u3Y2WHLVp6aQ81cWwR/iJWHwez6jTKv1mt74a/z9MmC502xkAlx66Rf4b3tCaZqgTVppJ1LPXk0cgRV3UkGnXw7MseyabZPq0lMWTtIdZOgLLcJH4jKiL5jwX/oQgC5cQL+D1kEXt5Cb9+q+FVepZ2A1SbwHUASHlXUHqxHSeYVIQnMOMuFEyOomUEsUVIyyg4KMNY/LqvGcgegtkeScZIbRVIU4NLiQfuDbRydpn2ry5YekbnlZfbcpt1LWQckconyR+H5trc5HYTEa1+NFSGDNhO/z9GDddAFzbbpkg6Pp48QOwh0crKyshIqUJMRbDvZiHIIyZABVrevV7CGkce/fg=; 31:l4ZWgE/vmoeqkPo7PHzPgG8gSq3fmEyuK/v1aOEwKNkGUG2RYETe9/LSPCPXjXB0/HcBP9r4VpLiPz/IHAQwfDIXRuPUiIRW1iCr7NvWjpXYomtD/NaxPaPjsgR13qIrgY7pN1UoRolRnKDoU243Io/4ShnETQJq3O9Ww35x0f/avySaq+k0VSbb+Nw4Yvnd1kqsCwNWxUXuKFYNRNeu89fhO0oAiTVK/KF88ndjZOs= X-MS-TrafficTypeDiagnostic: AM3PR07MB308: X-Microsoft-Exchange-Diagnostics: 1; AM3PR07MB308; 20:0stc9w9qYRbLQawyn2i21CHpdLM4tpF8QzCnmnq0S6cvXJQYoraolKerJxx7Yr+V1d3B3qJyjMKVM/bY+wxrXwVNKBlY9Xre4IwMbx6q77N0MDeu6FXcVnMRzB94Ck8U5UR9v+NYtg4TjwIOngzay/Jck4I4WA0J+lh5UoCFUiHijAqRwmqkxGGjvEMOI3vwMp85FX7bWStGLHdzXvL+mIe8WlUr31J4evsghCmT1gI9lbL9+MuFD0bzTZroIess47wAZ0glHFlW0nMiH/EDkk239yRy0UDDSe8NjH+c0Yb1qmCDUtyyIwdiZWNQWvEgqeSSB0q3wCLm+FBbHqTF9WCy0kCu/r2mV7l7eQoNMLCE39tDz/X3VQD+lonilUiJDBUMwSqyvGAliR9+P5s1NwzRmCWyNwTCthFKJc/Zof8GUJjAFuGt7Yb901Tmgc9DDSQNZKZ7USHbykbvjSx62+Qq7GVIF4qBtPkhaAv7ehemAAkZgy7yPw/nZqw8TBau; 4:c7aVytQA5bgUrLC0lx95zzeIIRaWxXzuEUhogKGFQxu2qpOrvJVWANlIdLO713GbKWusIxr5r8zqlGn0o/CB89U0SqPJwXtGEuhRDiM2iz6RZ254SnQPD7BLUAglRH6JolKG6qYbpDeToTuJUH06Q2frSDf0jBF5w6mqfCFaE5TAJ1JVuiPFI2x77sSdaPYXLQKn/gexwJGNfLxKYZsja/9jbmzktbVTURBLSuI3eZp9FqsYj7wo0GmzewYJQIr7 X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(100000703101)(100105400095)(10201501046)(6041248)(20161123555025)(20161123560025)(20161123564025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM3PR07MB308; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM3PR07MB308; X-Forefront-PRVS: 04569283F9 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(376002)(346002)(189002)(199003)(54534003)(50466002)(25786009)(5660300001)(33646002)(2906002)(16586007)(316002)(4326008)(106356001)(8676002)(81166006)(8936002)(81156014)(189998001)(48376002)(86362001)(6506006)(68736007)(478600001)(6486002)(97736004)(6512007)(5003940100001)(50986999)(105586002)(3846002)(2351001)(2361001)(7736002)(16526018)(101416001)(36756003)(6116002)(6916009)(53936002)(6666003)(50226002)(66066001)(305945005)(47776003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM3PR07MB308; H:elxacz23q12.ca.am.ericsson.se; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM3PR07MB308; 23:fKQAiU2Iz+NqYuwCSlSwlUMOZ5Z4C3/GxqdFe9GBwd?= =?us-ascii?Q?gz5geym7qVNCgoXmL9i27IaXHHNvFITXtZcznKNBCirv6AlGO3QS2y6T6sCW?= =?us-ascii?Q?2K2UADdVRzyT6QS0tZCIHTKacgYAogCJaHQhYSQKDgINq9bRQ7gulwmrsbXI?= =?us-ascii?Q?g0BWqwo/qKv1nGzVaU/ZUpXmaB0HHUDCKHzTluCdf7o9N1vBaAA2QqSCc/Ss?= =?us-ascii?Q?CA0p8LIiJJ/iv4/2Q+fAVtrlL3ukVZKiQAD6fgUzO3Fuyf2r0UZx7msL+sTH?= =?us-ascii?Q?8ZZP3+9DFwsSFn2zurO4wLbkvFz1ctllTVIJRF1sik2nmblahDqRr2ZYYgpO?= =?us-ascii?Q?gT/BIh7EtvC2C/JGq8LvvRrawfAh2Aerfj1btWQfCIpENgpEpTYAhgT9ocO0?= =?us-ascii?Q?y89vpr4eQrDM4WVHnAkuOk0U+4qwUvV01w8haM6GINfHq8b/lKs2FOKT3uay?= =?us-ascii?Q?FnxkwEmcchn1xx4FIOPe+oEBv6rqqVAO9Imx9MhStePUZSKpHAew0DfLzVuL?= =?us-ascii?Q?FHke/3h9SdE9+3vXcC+iSWqnI/X+bBlIWMvzTAY17fegtyVQxmaCy7dT/bcM?= =?us-ascii?Q?ZIOUZVfTLeAWZ4UYe5GRLLtkVM1OLXlLicnLnyWMU1s0QjaslCH5bjYkJOPY?= =?us-ascii?Q?I74AoYD28I/CjSMED7T1Z5/GasDdHKRqPbFOWnATensEepQo4mMjD4xGA/mF?= =?us-ascii?Q?AIvRvRoxxWf+9tb2ctKmYOW/iAxCd8okpzEaULHIbJ7tImpJvxCw7vwmGu9r?= =?us-ascii?Q?abf2Wdfrv+yr84J8yrPtv7hnc7b3IJZ4srGniRWsBzrsiPpIelE394pYTXhk?= =?us-ascii?Q?Fl/+UFyKFNbN+6AXIB1qmEvNWQLxUQE3GXx0jmHSFq6fYjgkVIliRsvMUUxF?= =?us-ascii?Q?vpgyWG5mhfl54CBveQ5V+AMg0w+vC/Uyi2U3lUCfqxx5862Ij5nATolFAf+c?= =?us-ascii?Q?1oZgjzeERYJqvrMVPjAayVfzD+SMZrV6QDzMkRhxvSPkRMuXfm1GmO+bNQ/g?= =?us-ascii?Q?yKwMRyRTAp60W0ffI639noLmw/WpSJsToRkg+uqKRlB59fj6uMbNjw0m82Zh?= =?us-ascii?Q?h+cEwTJY6wTZ5TJa5DI0WkQZGSU6g57C4hnyGGFm/tMr71RA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; AM3PR07MB308; 6:G266btz2HS1fMRk9TBz8fCzBOlbA05UhEnKlUEEsud+zL2xcHUMXpSuf6O9asnIQxjIjdhcV6f4ONlWyW1xKRpmZm14i61LHN/cg5qcQsf/VpQeTNJhosuHbu9CI1EG8sz3tV7cjpf0eMiFDXMfnU8l59KxzsQNYjltn5nuf2ijNd6z2kimVbrmKsaVcCWmY0YZRpOdH9osGbH151JAvfT7WGKsDKIKQNWiF9ti/nutmH7NbdN0qNFyExQWnDQ+N04M8cPTDx2Q8VZuetTzRDv+XkVc3GU1gZpyc8hcsIKPF8qb2hHSdG5e2p3JgB9iK04Bngj+eB+kDpIvLVzrlzg==; 5:NDk52bX4bNkltbZWiARwVTN6wmkh6v0yZPk0hvsqroNrRuB7OM/oiKDvTnJQT66p2fFyz5SY+0iIU5zgbOcibKvU/YS/foO4gQ4CYwy06tQT/0KEXbzTChv4HC14Dc+6D1bszUiuEvd2eKnQJUBeLQ==; 24:vno3TX1r4yGeQhptOaX9Tq0JvXcXYZ/k/ZBszr4dfs1DXAR+VPevaSrcfTzqfZ14aD2Bh/xtYvNQ8XvnF7Kkh4uz9COdQQ7nEvcQULa/5Ns=; 7:BVSJVArvIFS/G7CjQikShAdCAIUJ4TWpvmgXBHyebmxh75UV5sCOvy2NZRNF/OA0ZXVpCbztw7uv50aCnoT5r00X1wJh+Dst5g2/3imCKIigJk937Rts/j4xRF3j1UYvNrLt5vtJOZV/fnQkCYaKFR5hucJdojAf6IPH1oTDOvUWQV9bd1Ys/rHfmDW3bRkmoYwTDhgpjOCr3B7UGPNuRUWKICK6sTsBE4NOW4VioQk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2017 18:03:27.3959 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR07MB308 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes From: Simon Marchi ... so it doesn't shadow the traceframe_info type. It think it's a clearer name anyway. gdb/ChangeLog: * tracepoint.c (traceframe_info): Rename to... (current_traceframe_info): ...this. (clear_traceframe_info): Adjust. (get_traceframe_info): Adjust. --- gdb/tracepoint.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index 72e920b..2f1b7a0 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -133,7 +133,7 @@ static int tracepoint_number; yet attempted to fetch it, or if the target does not support fetching this object, or if we're not inspecting a traceframe presently. */ -static struct traceframe_info *traceframe_info; +static struct traceframe_info *current_traceframe_info; /* Tracing command lists. */ static struct cmd_list_element *tfindlist; @@ -211,8 +211,8 @@ free_traceframe_info (struct traceframe_info *info) static void clear_traceframe_info (void) { - free_traceframe_info (traceframe_info); - traceframe_info = NULL; + free_traceframe_info (current_traceframe_info); + current_traceframe_info = NULL; } /* Set traceframe number to NUM. */ @@ -4101,10 +4101,10 @@ parse_traceframe_info (const char *tframe_info) struct traceframe_info * get_traceframe_info (void) { - if (traceframe_info == NULL) - traceframe_info = target_traceframe_info (); + if (current_traceframe_info == NULL) + current_traceframe_info = target_traceframe_info (); - return traceframe_info; + return current_traceframe_info; } /* If the target supports the query, return in RESULT the set of