From patchwork Fri Oct 13 13:45:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 23542 Received: (qmail 71125 invoked by alias); 13 Oct 2017 13:46:12 -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 71017 invoked by uid 89); 13 Oct 2017 13:46:09 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: sessmg22.ericsson.net Received: from sessmg22.ericsson.net (HELO sessmg22.ericsson.net) (193.180.251.58) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 13 Oct 2017 13:46:03 +0000 Received: from ESESSHC023.ericsson.se (Unknown_Domain [153.88.183.87]) by sessmg22.ericsson.net (Symantec Mail Security) with SMTP id D5.D4.26775.893C0E95; Fri, 13 Oct 2017 15:46:01 +0200 (CEST) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.87) with Microsoft SMTP Server (TLS) id 14.3.352.0; Fri, 13 Oct 2017 15:46:00 +0200 Received: from elxacz23q12.lan (192.222.251.162) by DB4PR07MB313.eurprd07.prod.outlook.com (2a01:111:e400:982f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.5; Fri, 13 Oct 2017 13:45:57 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH] ada: Use std::string in print_dynamic_range_bound Date: Fri, 13 Oct 2017 09:45:47 -0400 Message-ID: <1507902347-7971-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-ClientProxiedBy: BN6PR2001CA0023.namprd20.prod.outlook.com (2603:10b6:404:b4::33) To DB4PR07MB313.eurprd07.prod.outlook.com (2a01:111:e400:982f::13) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 117e4993-9c7a-4b6c-5213-08d51240bbc9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:DB4PR07MB313; X-Microsoft-Exchange-Diagnostics: 1; DB4PR07MB313; 3:JrBBqjbmT6Huo4EpbexHLyUO/4isS8ImhO+sgxNgEhyQvcldAuxuYxEMf0NhIraJpToVBmQaKz9PJU1E8gdPWD8fDlG0tMKh1FZqnN6cuthF7fnZJ5uBgdkCUd4b0JN1ifFPoCk1MDhipydD2iXCmOmh3qXhmie7Jh6DubZd/+1XVRodtHikg4I5nxOCguGEXIs3tIhQ0wxX3mbZH3TEOZMDorwudWDbZo5XyPKCRfnLZTUZKrNnG/MO7cH2Ni51; 25:XhinvQ9YL9AhEDlM3HSiEPr3OqKV6pd5E+uq2Gsb826DPdH7KCD8vfUdOy2dZWFJ9v+HYwrebLfpGYrOTbp25qGohVhd9POS7oex5IAH+p3QjqFcH9Sh1ydFXelTRv92Xa513Ufq0o0/sqLbeR7WRCD7IshVU0Ftlptx+VzVgSfX2UFasKH8yD6lXQ5U7MLFMFSi8VIiLyuPPCWFUW8T6J35B+J/LwKs9IAXs3dYxJx3ZWZGvXUvVqoWZBCbjxBKa6C35xT0XkNPaGwy9lqDLM+5tyqoIu7pW9unkd/DTkEv3ENsL70KOF5mlgccxC7sdQWAsvESlyzChS1+J27freKv1onZFfxfP4rFaIT2kvY=; 31:sbeWZBCiYylQSQSp15TYH3PCP3Jw2XewgEWKdvXAwNprXztLlSEzZ2JaCTiSEOKkLycRtBcvEzQxgUWckhTcMMdYlJtF7FDBDKd0OW5F+HCLwO3KzqYOtD90/cWJ+ONKTcMNuB/tOw3LrcmsIYDPhUOO2KhP9HID9DaFWmYwH2AVVhehl6WqYvpXFuPVezRGQtwFQQ6HNQRcJoV1kHD7Nlqp4RJaLOB8HSxske1sK+U= X-MS-TrafficTypeDiagnostic: DB4PR07MB313: X-Microsoft-Exchange-Diagnostics: 1; DB4PR07MB313; 20:Xc61m4lfgcdPEmpPjoslLGhR16L0U0VGj3GVSEOBHFsiPOpQ7B2rVAQHq7VmUnpesY8r1WZQAIwIK11ooRxjvUWO/5Ry0D8IeW6yeshs+DcXfPLGqqtIN0s4aTkrTGGsSXH8ZuffPpMO3FsYgWy2AkY8u4StMdcCQydhRw2lNLvOqeO9SRdvdbi6cGlTbItTs9mRSRk3GujKfhMf3AY2LJIKp+wSWNCRexSVKGNvWjO6//wz+cVvrc7NzTCIP22gZyVIh3u4lXNAlSCMWzG4blR/aDoGLoXxBL0c52rQ1w/a4fx+LftmOPDo5vAK3TMHx94fZk0uAWgVH4fIF8HbxTX/Xquz9J/oonljdvFm8NQrnUWMkBtGsK9G7p/8jxmYLFTg4M9isaxOUuGE96qyefN3jCXrcVZK4BevMyMLeGFJ2g/ZjCRw3RBjV9UPOQjb9UMfSWJgi6WbkmZeIk/gIbqFaZVuDSXJdHza3qcciTyzQtzgJeykfD3vIm6FuIcn; 4:jcZ89Z0x/FZ/nWpoHY2Uh9b9v46QA/3NbsdN3IIfFVgaaCpofDIvb27bNRVQfea+AY3SUU2WBQqEampVwvXz8NJnCL6r+QH1Yob5W7qALHW1jvtyJVxJIvMvJhxqWS1eA2ZU8JNOIknHDu6pJ0Zh8HiV3vcynz04hjzPMnCJfTNRVtgCw8oai9OxKj3DR/xTRRmxwzyw+KOdyV7Q2t9nxqYOHhNmOqm30pcON+pbSiLZ9NMVLlncMwRzX9ycAQhAcIr87JvHhLWAQFwDq6RfboKHNeUl1CxWngiCCyOKx6k= 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)(3002001)(93006095)(93001095)(10201501046)(100000703101)(100105400095)(6041248)(20161123562025)(20161123560025)(20161123558100)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DB4PR07MB313; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DB4PR07MB313; X-Forefront-PRVS: 04599F3534 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(376002)(346002)(189002)(199003)(54534003)(7736002)(36756003)(305945005)(47776003)(5660300001)(53936002)(2906002)(3846002)(6116002)(101416001)(5003940100001)(6486002)(478600001)(6506006)(66066001)(50986999)(50226002)(8936002)(81156014)(16526018)(81166006)(316002)(16586007)(33646002)(25786009)(105586002)(106356001)(8676002)(48376002)(189998001)(6666003)(4326008)(97736004)(6916009)(2361001)(68736007)(21086003)(6512007)(107886003)(2351001)(50466002)(86362001)(69596002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR07MB313; H:elxacz23q12.lan; 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) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB4PR07MB313; 23:bDudqLUjj9jZHBCB3SQSdBzawaSJakkCo0RrS3OGUh?= =?us-ascii?Q?EJxAwYFzPL+f2ueX99pRuviCJcRdgyb1331B3x+WHnjleMgk4q1N2Zr7FF2k?= =?us-ascii?Q?JrHgd41jODPfM+a4B5I9t7127LD9SUOwVTvkSfGCMJayUf1nFHJ1XxsHjP2N?= =?us-ascii?Q?jCKocvRIqrn9UAX/o9OO5pKabTqpSGZcUu9+CnXDVSdwjSsgT/z+Y7RorNdu?= =?us-ascii?Q?Oz5w2HjEvVJdLarRzaKrZUPZvXkJ2DPYGE+2YZCnXsTZM0J9X5EKJ9NU2AY2?= =?us-ascii?Q?ht5kDWFoueIQd1U0DPnTXhOPIl6yhGt307eks1AzS9IRM3ALoo2z8GtLWlwb?= =?us-ascii?Q?PNf8lv/qrvk11nHE+WlsDPtBlQYGjv3l+Hz867PgxY7t6AW3BaeAHwlr3YV+?= =?us-ascii?Q?MUbLyfRvct6zYTbF8UQtBWHlp9rJin+zXYGEeLHL6Faz9XuApKsaH5EVN+Ic?= =?us-ascii?Q?Okbfogyb0929SuhB9wmgMk/jDktMQ0RY8hwirjAKg7IHLBublGmNZgysHypT?= =?us-ascii?Q?V2T2oYl/iZgNp/4Ab4IIM/c6iJ3VnZL9der0d8nbAdqEF73pdNaxUDfVAzfn?= =?us-ascii?Q?oj69VreRysSGWMWb8b1QMr9pv6aXmC/dHn8TkjwUxL912p+qH6X4wf0X53f0?= =?us-ascii?Q?eTOVk3LTDaCCppkxRl3zqgIqGwV8Eae1lVwjkBaHrbNl/naQYF51wCXClvpd?= =?us-ascii?Q?WBUB5XrmBMvenggJXPSG1eOHy7YJEzbMo7B0ye/UUUbPnv17Dr0j7DHAa0k3?= =?us-ascii?Q?C8r1CixQtrTRcUwbrPoKfWOhZ+kviFQ2wGiULLywDXGc3YM9Y+mzcRWK0zAS?= =?us-ascii?Q?taf0p1cS1lghXQwkBKyPrMEzM0/dep/xucYKow59yQRMLBnCCyF5duUctysf?= =?us-ascii?Q?gnYGS8yyJVHNZJxTiWX5GhCt7LY4muAPzovqoHsjWzb+Os5Jq3Ls96JMWvy1?= =?us-ascii?Q?itldyEtxMl+838Vir8Qe3LCRuJHst4jrBwta9eh+4seRXE9Rs2L5wfYw67N5?= =?us-ascii?Q?HEcXwL87zpooRPo0KqIbWoSCNZxyRlPfJF8ITU5ODyL1jJDhp4dfAbz9k8xs?= =?us-ascii?Q?QT0V8GvphDeZMwbHEUsG53eW+CT4Zu9F3A9N8Cu/owkoXStap0Pah2O8PXJX?= =?us-ascii?Q?wxMWkXPxtBTp8jPswKctvmvlcXIH6Qjilg1bqVATtqMa6u4CGP2Q=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DB4PR07MB313; 6:2hZb8/jemlP/hBST9LVrsB0JaLb39tXF3Fq1lfteVAD1e2s0x6JJKMIiWcDGM7XVMw9CZK1HrS9k2XzsVQPnDgyESj/JfhcZOnXtjMmWI82YIDmyrMT9FpyQGY03FVyLTk8hH0crLp/ACwQuRhIHbd6hSZ2/JP1dWqacBg+ktgkvNNXlp8ExKqZraGrdn3qgW7/2jwh+NM6XIlpTbjlvaAA3t5+0igQBzH8+LPYAzGIzgqPsWIc0r7S1OE6c3HY1u/GCpMZzv1N4uZe/Bd7MnB/9j73i42Myoxgy9CCpvagZSSi9CNqFclq03Vqb5iVOnm9DxZ+Zl7fAtoqNaDg/gA==; 5:v72JWcYVTXQB0Tkq2pEtO7UBth9M/Ai556ZkVa7LOHZ8p7ANBqNa0JsTG/VXj8QdeMwaLxx0+hNWWx3SVbwEIPTEvaORDx1sSvgD3rC71tnKBniZzMWSaNbUanj1etjJ9UZhiKc+IKzElBKFF0CNob9Engp2tjpqCniBjccdmM8=; 24:3EnAeXdzRxX263wB4eBTBIV3AB26b5Y7jQ+dmTnOqkonYuIHcUseG3zE865xd/Rtuh7alf/1IEashPzEHFtf8wHEPUFWwdqGZKZWdEql3gU=; 7:Pr2dwbC4G65kJKT/f+mqPxTijExp9GHJmtfem8N3x4L/RG/2BhTPEP1DnZnjEckgrW4YraSke6c4f4zpds5vHglIjDrVS8X6P8rv8Q8mYUN3Rd1SL0OkEUNu5sC+eGylAuodRxgblMvJdbqZZwc/RtNE45c0GSptMRyIIutRs8MK96HbN66X29+5HpxivVhzIMb6r/TkcTL4vQZQz2y8ntUKU+hRClqISGtRL8wZcYg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2017 13:45:57.4595 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR07MB313 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes Replace this usage of GROW_VECT with an std::string. I don't think there's a reason for this variable to be static, other than it was cumbersome to manage its lifetime (i.e. use a cleanup) before. Tested by comparing the gdb.ada/*.exp test results before and after the patch. gdb/ChangeLog: * ada-typeprint.c (print_dynamic_range_bound): Use std::string. --- gdb/ada-typeprint.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gdb/ada-typeprint.c b/gdb/ada-typeprint.c index 2224bb3..0d1f9dc 100644 --- a/gdb/ada-typeprint.c +++ b/gdb/ada-typeprint.c @@ -253,15 +253,11 @@ static void print_dynamic_range_bound (struct type *type, const char *name, int name_len, const char *suffix, struct ui_file *stream) { - static char *name_buf = NULL; - static size_t name_buf_len = 0; LONGEST B; + std::string name_buf (name, name_len); + name_buf += suffix; - GROW_VECT (name_buf, name_buf_len, name_len + strlen (suffix) + 1); - strncpy (name_buf, name, name_len); - strcpy (name_buf + name_len, suffix); - - if (get_int_var_value (name_buf, B)) + if (get_int_var_value (name_buf.c_str (), B)) ada_print_scalar (type, B, stream); else fprintf_filtered (stream, "?");