From patchwork Mon Oct 16 15:49:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 23616 Received: (qmail 87748 invoked by alias); 16 Oct 2017 15:49:43 -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 87739 invoked by uid 89); 16 Oct 2017 15:49:43 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.2 spammy=forgot X-HELO: sesbmg23.ericsson.net Received: from sesbmg23.ericsson.net (HELO sesbmg23.ericsson.net) (193.180.251.37) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 16 Oct 2017 15:49:41 +0000 Received: from ESESSHC013.ericsson.se (Unknown_Domain [153.88.183.57]) by sesbmg23.ericsson.net (Symantec Mail Security) with SMTP id 4C.35.03220.215D4E95; Mon, 16 Oct 2017 17:49:38 +0200 (CEST) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.57) with Microsoft SMTP Server (TLS) id 14.3.352.0; Mon, 16 Oct 2017 17:49:37 +0200 Received: from elxacz23q12.ca.am.ericsson.se (192.75.88.130) by DB4PR07MB314.eurprd07.prod.outlook.com (2a01:111:e400:982f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.5; Mon, 16 Oct 2017 15:49:36 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH] Use std::string in memory_map_parsing_data Date: Mon, 16 Oct 2017 11:49:26 -0400 Message-ID: <1508168966-18495-1-git-send-email-simon.marchi@ericsson.com> In-Reply-To: <1508168838-17957-1-git-send-email-simon.marchi@ericsson.com> References: <1508168838-17957-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-ClientProxiedBy: DM5PR10CA0002.namprd10.prod.outlook.com (2603:10b6:4:2::12) To DB4PR07MB314.eurprd07.prod.outlook.com (2a01:111:e400:982f::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2683b000-de73-4f53-5b78-08d514ad813b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(2017052603219)(201703131423075)(201703031133081)(201702281549075); SRVR:DB4PR07MB314; X-Microsoft-Exchange-Diagnostics: 1; DB4PR07MB314; 3:RfwYkoelPb9NNS+Xyaz3UGQrFrBWAIwW5uubLrhgL0UEskAliSWQWnzccg4+ffLopGA596P+zyX7Z0B2zdlnrbd6ZCfcXkR6P/tUR6Ay/tO5SHHHBtsyPQZ0KUgqMNP2ONAY1oO6zNNK5+ixhJuG/uuYmEfdVWdYMtp4AKXPFPoF98u/47b/alG6HFXL4qPud2fiWQvqaU+LozRV+XrJpJQGBoNQKDTbkRArX5cvDWm/wCUe1Af2gpoe0ZiCK2EJ; 25:C+n7VAlpzE3gjlmTUajfcnVEB6pwlRzQBnFqsetyeiOqhxMTuKnMT1jF+ckPiRh0Z9EZOpdGXIYmTfZfmkweHz4hpVfki4Ne2h7pkXUxe31iQoULrilIk+Go+LuCnibsHbCvzWeDkAztD8TmBjjvsY8K90zu2zdx6mr6zjuUOs1Xl8wtgZ8jeiqlkTlAo+NB7UA2AgfOd20u8HgVZ87sQU569Ccz4sKjyHKuSyrS7Tz0Kv/lLfdSW36uf12zGpCHXg+3Objv5a1XxoUXg/GXwJ48DPgspF/6rt/u6/g6Q8/nSyZnvQIS0Du9VKRz8Z/X3kUKSnRFbq4TdpOSmk5qivs9+RfBpW5JaK2StmvZRLU=; 31:vnwY1JoRgDYGFJQ3jcSPpSnuVGunIKyR3rAWBIaJe2c7TBN3NUos77yrGbaVsmfRfSG9fXwreOkxD443iAHy6dXJuTdcZD6jO2iwK2tDqnMLaZiZ61qzw7Sz7tNibJtDHLMq9+DNXUzGBMf5D1AwDtbZVxkLj4O2EfCY9S7SMCR04fBb6hR+CqmUGGYH9nYbkNC2pbKEM6FnpYq7Zc5Go/JIj8nsTLLd1f3aWh0DCgc= X-MS-TrafficTypeDiagnostic: DB4PR07MB314: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; X-Microsoft-Exchange-Diagnostics: 1; DB4PR07MB314; 20:2JjcBUz9TQg8Ftdypvn/biMfPQvYE+5An8zqzyWGPRQ6bF86ASBIpTPYsCa50DqVoGH7/lmEncbFGn978m7hxGRJzzzOWxBabjFgb6AjDkRKlAoAKo3zE3OLsRGRtLlMv2O9wJH96890Sq7Wp3LEIhft4ia8R6YDIwoisLnKkPrYVfJ0Zddk7+Ha9MWu7zns1gbdf4JhqZg2QbcFNAKbASWlJgYqJJIUoLktc56EKaWszJbq0C1JQwe2G/URxrC41eMuFDBgnj3+xKpaExeH+akBh+B4RgwGxTIIwGCEX0Rd7RZbR9qMoUQLb7mL7+4G4MHZJ4ZRg83xA10MDf8KpXtfZ/fLoCBn/ga7r65y948FMgy5KajCZ9Gm/tCFZKxuThtX4CiOBDES323o52ndLAH7yxJT5PVGX0YIr17NQY39eh1oYYiCc6xax1hP906yy4KV81fL+KjK93vCyo98Kv0fjEgOc+tEZgzmZbAXHtr2mKV8ha6WC0qsNdfztgUt; 4:dQ79IMcNyTUnaeqh18Zva+TJYsUswP4s3BVOqnnMoQSt2Tn0dQpwgpOCtNWhqX/KOssQIz3pX1jyQAnP35OY4YwE2sEbwRoraBSK7l8XbmzPnZDDj/uJwkJzELQ86+wKYXEjgt3GBk5U35jRRV6/6th1a/zapM16msJQQWW7PsdfcFE3wrudOmkYMfpkM3b8mjgNmNLrdi/dx6dddfrJF9mfsil0OdkWxx6QEahMblHMLfHThBd+bPtJJYa4NI4+Xj4B5mgCC3gza2PkPYY5rkxRKNwsxMWv8MNqraZyQb4= X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(3002001)(6041248)(20161123562025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123560025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DB4PR07MB314; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DB4PR07MB314; X-Forefront-PRVS: 0462918D61 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(376002)(346002)(54534003)(189002)(199003)(50986999)(76176999)(107886003)(81166006)(6486002)(6506006)(86362001)(101416001)(8676002)(81156014)(68736007)(36756003)(48376002)(305945005)(5660300001)(7736002)(6666003)(50466002)(4326008)(16586007)(33646002)(478600001)(316002)(53936002)(16526018)(189998001)(6916009)(5003940100001)(2950100002)(2361001)(8936002)(6512007)(47776003)(3846002)(106356001)(66066001)(25786009)(105586002)(97736004)(50226002)(6116002)(2351001)(2906002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR07MB314; 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; DB4PR07MB314; 23:u+gIwSN1vfeoR+1xvERpnYNjmja21nJC5dGWLtQuMI?= =?us-ascii?Q?kgWMKcfLQyCfG9+CALukFxlr4Hj3VsDw1GSu8/v7jxrmKupmOp0pB4+ZOCFM?= =?us-ascii?Q?AO3YZDYkb2y49TgnQ8lY0PGyT4UzTDeUXE52tVi7TNL9fjg0pepkCDW5J5mS?= =?us-ascii?Q?WLbGptlPz53vOugSnZgem5wfMx1ee0leZBDGnU06tc+CUjamixqAexnNejb6?= =?us-ascii?Q?TVAtih9hJnjarb1pbKDhLUeJljyiPDcSOW9iv9CBs2cZEoIxg/nGo1DEIUwb?= =?us-ascii?Q?WmVp3pUYTYKiOH30kOcL5T7HshR4zlPDDMBh7FjgS3gHuwXIipKyEZWUoT5q?= =?us-ascii?Q?vlj+bAJfyq24RIEjwuurlzg3nyXdbey4bzL0pCtpcoHdu8A1VYaz/XUbzJwQ?= =?us-ascii?Q?nKEvTy1AdM3RQe2gcKryZbBpkpaDseQNsb3a8EqWtLNDju0UStMoQi/ZbIfK?= =?us-ascii?Q?/7P7wHGT09jIFZCCVPfDobMkK0AMOQ4/lezz5oGvwLH6+AOWUD4tBMHxZkle?= =?us-ascii?Q?jjN0ZN2MecsCL9Z4ILgkVdsIkcGynTiNqiZIJAF8J7CtUHfDxwCsYE6VMdfV?= =?us-ascii?Q?dsyYQ0eEFsvIWUXgttArUEfUKTpNOu+01FgkH1lodsWjrS/CoUoBDNA/uny6?= =?us-ascii?Q?8XMOrCZGSGAkod98yElsb1aaOTOTeVHa9V+Vns50FFJGJ9fypX0TcY+gAXwl?= =?us-ascii?Q?tOZTqmc/azB7YGZm/8V9f2TNQOcycj5xiWAWpp9xr1JYbee5kjlLFp2OukN6?= =?us-ascii?Q?RLmYG57Rfvhd6fV+jksf3pRF7T+BP2rkXPjsT46aTMJyRWc4uIgMZPxO41Oy?= =?us-ascii?Q?givN10aiS2wlTDUm9e/uRyzyQTCoUsOgmDmTsHkYlb72UMPyfyg9tlP5wBpC?= =?us-ascii?Q?CdKowE8Ez3l7PlbEcQ+SsSh3wjzlnNe1zb1Jgvc+WCbdPL6Xjsk6eaQ28ht+?= =?us-ascii?Q?J6TwRlbsHn6iCQilWJo097DbGBJvZuWn9GC9Zf/rOCLD3on866tP7vndmTQt?= =?us-ascii?Q?Aup+N4lg6nDUm70OsYvUuN8SC3+f/FVDJlN4cRjDti676PCdd7n/aQw3VmRG?= =?us-ascii?Q?WnQqjadr86bGxRMjJP+TSlhgyKLTB49TlCz5/vigpuB/v2BAOX9RIFGaO/D2?= =?us-ascii?Q?2OprszPFQ67aQR7uNXdwpTj2QkdCmPPFOLjjK1mV1uXFXuGu0k+A=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DB4PR07MB314; 6:ixR6+QHuAirkA5jjUN+LH8mztrunJG/g7VB3fuFU06aNaiauRqVoiQX+IuTWR6Kr2GbQgwRmOKY5IgnyNtxdCeMhLucWJZM2zI37/dXMTU1ASHdHTaYImOzo7szzFYhN8TCRY244nlceTaMKkP6U37DeRRG+YOBTzJaa4EErnWjR8tzlrDQPisdhPI5mhQNkkRFescKH43B3cbtrtAO3p4UfwhjSWdRrMLqv7jfT5yDmjigB1nWV7ClGm2FarUKvSk8Be+Li8tlwn7MC5MfsRe9xKXWvvLbp8CgrMVnM6BsEJMqYgYnS92IypCH8uB+jOswIXh6f5jPCXcoBs5YSuQ==; 5:enwIyoIsBYVHwF4FswdkUvFLBbgURDPj5GdyE+OcMOmYyeqo98kJlt9EfW6+Z5OpfjnQ+nlfL30bKmc7d2k2Q5dSERhZFibi/r7HvczPsp9GBcmWGNW8YWpAwHvq0qxBN4a8KhwZuN6pJE9L271+Wg==; 24:wZs890TpCmZQRhx0xFiyEyAVRw13xLEHrMeruuYC/C1QGfJbbbaWSfmngHZtWr4TG2il/hqwk8JESynttxrUmFozR4paZ2T8fLk/d6+ouVY=; 7:GFa1JPpkcqlWmG8X/63CiiCOTJefLlaU7T+k4jnArkrv5MYopCnEza1jeBxdEvi+lSYyuAgobEXyB53E3YpyWn4+84i3kos3DuCpzu3Lf7EOUj7n8PEUtcLCgFYu1dpwyfZo57kWN1+7DMMUVObiGO5x+bo1Qdl2XcnoxE9QJEDiWKZ7IjR/GieQK3TmZsN/SVN6XP057vz42KW3id8uoUSCIxcjdFt4Alk4wKzka7Q= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2017 15:49:36.7216 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR07MB314 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes [Woops, I forgot to send this patch. It should be applied before "Get rid of VEC (mem_region)"] Replace the fixed-size array with a string. gdb/ChangeLog: * memory-map.c (struct memory_map_parsing_data) : Change type to std::string. (memory_map_start_property): Adjust. (memory_map_end_property): Adjust. --- gdb/memory-map.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gdb/memory-map.c b/gdb/memory-map.c index 0b21456..ff05394 100644 --- a/gdb/memory-map.c +++ b/gdb/memory-map.c @@ -43,10 +43,11 @@ parse_memory_map (const char *memory_map) /* Internal parsing data passed to all XML callbacks. */ struct memory_map_parsing_data - { - VEC(mem_region_s) **memory_map; - char property_name[32]; - }; +{ + VEC(mem_region_s) **memory_map; + + std::string property_name; +}; /* Handle the start of a element. */ @@ -103,7 +104,7 @@ memory_map_start_property (struct gdb_xml_parser *parser, char *name; name = (char *) xml_find_attribute (attributes, "name")->value; - snprintf (data->property_name, sizeof (data->property_name), "%s", name); + data->property_name.assign (name); } /* Handle the end of a element and its value. */ @@ -115,16 +116,16 @@ memory_map_end_property (struct gdb_xml_parser *parser, { struct memory_map_parsing_data *data = (struct memory_map_parsing_data *) user_data; - char *name = data->property_name; - if (strcmp (name, "blocksize") == 0) + if (data->property_name == "blocksize") { struct mem_region *r = VEC_last (mem_region_s, *data->memory_map); r->attrib.blocksize = gdb_xml_parse_ulongest (parser, body_text); } else - gdb_xml_debug (parser, _("Unknown property \"%s\""), name); + gdb_xml_debug (parser, _("Unknown property \"%s\""), + data->property_name.c_str ()); } /* Discard the constructed memory map (if an error occurs). */