From patchwork Wed Mar 21 21:25:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 26410 Received: (qmail 104460 invoked by alias); 21 Mar 2018 21:25:44 -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 104173 invoked by uid 89); 21 Mar 2018 21:25:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 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=SCM X-HELO: sessmg23.ericsson.net Received: from sessmg23.ericsson.net (HELO sessmg23.ericsson.net) (193.180.251.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 21 Mar 2018 21:25:40 +0000 Received: from ESESSHC005.ericsson.se (Unknown_Domain [153.88.183.33]) by sessmg23.ericsson.net (Symantec Mail Security) with SMTP id A0.D5.21824.2DDC2BA5; Wed, 21 Mar 2018 22:25:38 +0100 (CET) Received: from ESESSMB502.ericsson.se (153.88.183.163) by ESESSHC005.ericsson.se (153.88.183.33) with Microsoft SMTP Server (TLS) id 14.3.382.0; Wed, 21 Mar 2018 22:25:37 +0100 Received: from ESESSMB501.ericsson.se (153.88.183.162) by ESESSMB502.ericsson.se (153.88.183.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.26; Wed, 21 Mar 2018 22:25:37 +0100 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (153.88.183.157) by ESESSMB501.ericsson.se (153.88.183.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.26 via Frontend Transport; Wed, 21 Mar 2018 22:25:37 +0100 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from elxacz23q12.ericsson.se (192.176.1.80) by SN6PR1501MB2014.namprd15.prod.outlook.com (2603:10b6:805:d::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.588.14; Wed, 21 Mar 2018 21:25:34 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH 3/3] Remove usage of VEC(char_ptr) in gdbscm_parse_function_args Date: Wed, 21 Mar 2018 17:25:09 -0400 Message-ID: <1521667509-303-3-git-send-email-simon.marchi@ericsson.com> In-Reply-To: <1521667509-303-1-git-send-email-simon.marchi@ericsson.com> References: <1521667509-303-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-ClientProxiedBy: HE1PR0902CA0011.eurprd09.prod.outlook.com (2603:10a6:3:e5::21) To SN6PR1501MB2014.namprd15.prod.outlook.com (2603:10b6:805:d::33) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 174ed158-20dd-4df2-1459-08d58f7248f0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:SN6PR1501MB2014; X-Microsoft-Exchange-Diagnostics: 1; SN6PR1501MB2014; 3:1dX+rCM48NH5VJ5tvhEIgn9Wa8G6iw1I7wjmLRfzdkX5LQ0pmC0YqXDsWTI/jYp3ApvZ9e/hDmUMlXP2/JsHfVed54ZanySpe7+lk9H5n/5cUyCGqHPmOKVDSHfHqdX87TqCLwjzzuy3XBdfWFb8ISzIXYwDMzma0m2C2oLjueCwNguzPsNU1gR0ZAoqvSa+OmcSv17u2Ujbq177Bmy2LrfzrSsvFuiHO+N00NuFNB39SZhp9w//+NNLkiVIwF6V; 25:S05tMGrACauwW+DwMrn9yuDoYOwy+YrPKSMI5ghQSopddH5rIst0BvNOWMyFqG75RMlRLsDghafDajwBt0e56/kO73SL4/SZ4Yo+Y49EJSmEeFS+7B/jhBX/r6DUO8ZHoYaLJO41QCR8weI/6oafvtNPowIqfTqxPPv3rdiB6e3vwMe5izWEj4U20PFTEMrnUfL0NeCRXPA9iOz2aSYzMjiH/lkVF601cYfpQfTfSP+v+cADDPIsEOps1pmn9l2W6u9T2uzf78nlK7Mc1sXesyp3VbstmTCQX9frFrdVVtb1xO3VNQgg/TtoOb2cYzqBUQfevVri+M+gt/dUY17khA==; 31:3a03/6JuKDxaenNPFZ53bm52rUqSG5jdrpxzrtgOcPutvXl7irJELqoJDxm31iGTcda4gGxzPQC3/vw7v3Y1pdoRiA0P9D81SlSyyh03HdfbYWNjvjeU80QqP2sZ/qo4Uk44F/ZkbYYVp9s4gOh8YTXx1pE7Q1S2Ijo/PyToj2cvI3gMHHjXW3z8rXwy2X1CEaFR6VONF0MJD/HuTCommQM4fsEUo07cVfSZpJntBLM= X-MS-TrafficTypeDiagnostic: SN6PR1501MB2014: X-Microsoft-Exchange-Diagnostics: 1; SN6PR1501MB2014; 20:i93mlbVzN9i0xlu5sjk55bZaYmG1oh1V5CJlKAzAD8l1/dFrkVWuC3W19uZ9plvMtsudglluCZ8UOExmRRNpHnPiWbRRdXG0GpwybCgj6zAnsd6UarfO7cYXtEauyO/R9E1B8IVunWtj55bDepJivIAVzKceCdumn5LGHt2Z5s3EbNBVgWrZAgIIbOSQeH1L6O4tmjubdqTbpy+SVyWfiStRt/+lU66wiZaN0qtQS8aAF5NZ3deo7bPcFLjCbILL+58+tH1j5Nz57VdAeqvmrVerWq3NUSmpJb5zf4fmlIyXXkAlTLFsnl2EI5TddOHSPnBfWYn80uMs8b+5JJUfrSUX6ODm/pDbA+h1lLmrWX3T9EqpbJdZdJ89mXneCGOYEgc6/DpFPQezfk1M7Xl+hFV08b7d58bNBfMR4L+pvC5hnH46mpA8Xzs7RLISU3t3E6O6IMk+Q2s/zbo8QHmCHj4JXJAQDVwFa3kWUsWJp/GeuQSGdxVKU+fiuCCjwI+E; 4:EsSOtJIXUa1dqN/+2GCXvRM9rl7Ef7YhdIlNvFph43jspZJMIxLq+sbVpUJvMB7jRodvTvMKu9hrQtsWmucWQE7vJ7F/nDwLMtAN54yV+6B3DvvRdxU7VeM1lmoUbdfxTU1gCaNLfyUn0njBa6aOLcoslHnqmSuttDfCanYaniPlCRnFU/A8QHm2WmwdJ2HinYdG/mEC6jfrOshiCVwAprTwJGJHIZdWwmvAvfCf3oqtCvRa4vT91OV7LmsgVpK1Se1NOi/8HKkLLwwoyMgV0lJKlysQvX9w5tdDFOg07bUYMzMef3TpVFF8cLXWG0so X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501327)(52105095)(93006095)(93001095)(3002001)(10201501046)(6041310)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:SN6PR1501MB2014; BCL:0; PCL:0; RULEID:; SRVR:SN6PR1501MB2014; X-Forefront-PRVS: 0618E4E7E1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(366004)(396003)(39860400002)(376002)(346002)(189003)(199004)(54534003)(2906002)(69596002)(47776003)(3846002)(6116002)(50226002)(76176011)(6916009)(2950100002)(16526019)(26005)(4326008)(25786009)(59450400001)(66066001)(6506007)(386003)(8936002)(68736007)(186003)(478600001)(316002)(2351001)(6512007)(2361001)(48376002)(7736002)(36756003)(6486002)(305945005)(81166006)(53936002)(53416004)(52116002)(8676002)(105586002)(86362001)(16586007)(575784001)(106356001)(5660300001)(50466002)(81156014)(51416003)(97736004)(6666003)(446003); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR1501MB2014; H:elxacz23q12.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; SN6PR1501MB2014; 23:CD7bNw4Bi/RcbveLhkg9bOrxYtvFI8EyVchqDDy?= =?us-ascii?Q?2qayd5C+lLV3Ont5xus+QxpkuDgnvvFazmfRiqrfyCVLjFsfBxA7NvZPN7x9?= =?us-ascii?Q?oOG+gdUuQMimIR+8B+bQJt/if1RKbpY6Qh2Nrds7Vw+AorWp5L/OhrkeZsDB?= =?us-ascii?Q?FNekPyrHWLCMbPPQ7dgm4myx9l+4A0cgqiR7sPBi+AxKgF3GlWkjS9lAReBd?= =?us-ascii?Q?FAXdJ2xiIRVhW5ijyOoE6xiW/8G7wB6BfkyVEsHemEoLt6dZkqrHjnxrF10t?= =?us-ascii?Q?wwOc10faHisfdUQlZ5GFQqCwQdZHIS2OQKoEJCo+vCoD/Loe6lVyvpZdq52q?= =?us-ascii?Q?rjVyS1A6AhUxM72eGoeKpUm21lz4z8UgFkzUe8YUg6nFb4/3K71+z/25efUi?= =?us-ascii?Q?9LvRQzkvyjOD5+Yn/kgkSl9uzhvo3Q8Okzz8G5h+SV/tAjQtYTssNLHMHIiw?= =?us-ascii?Q?oy+6mI5Zj9OmZKm6T1SHcMe7McbMyOTvRZ0HU7hyDqI+tOZ64PMFn0h4w2Xf?= =?us-ascii?Q?AJOzTabmReG/kpACngxCPWvH5RP1RfKwH2w3tXcIoFJB1t24117P5cJEayfX?= =?us-ascii?Q?GoNgkledbD8mYxsYp/Zx7Jj6VhPR3PbseCI8Pfcr4ZFkon4xzUJ9CQyd4790?= =?us-ascii?Q?6ggoOYFDFpC4SuDE2XtQa2yuTCMMlep7pg6iVKTvWwrZDwnr9k03eDPysTH/?= =?us-ascii?Q?wQNSWzjwCQ4buxS9RavcisDojdpClvcpoRSPpsFL8ds9v1B0bCpiPVY0I938?= =?us-ascii?Q?Dtpy8QH2YMBJfUPk6Xr2dXr9C/+KlagaHGwvfZPfpDHMc62DVLqJIKbR6+Z0?= =?us-ascii?Q?gGs2ntT1qNlsVxtlWG10868WHifUONsraLKeONzJat9yNgVOw/duPuCduhyW?= =?us-ascii?Q?WB4xDsv44UBZcE9ffB+nSyfY6y2rFhX3CHN00hbmsbYDopkCWb6+xSlHy7QF?= =?us-ascii?Q?QX7QomZKZ8ZFCDdT0qXVHDcQ63UK9B3MdZ/N6tAfbq6vqUEP3jvMHlTtUFty?= =?us-ascii?Q?zhrpEPuCHUwV1Qjrz15XxX6z9TUz4eKfbYtY5+s4Gy2QAYOfNpmuc/AD/gAo?= =?us-ascii?Q?e03fvnfU8HBTNUv17B/x5nQfEA69bQCo6TGoikWFgKugyOqx69zLVlU677y1?= =?us-ascii?Q?ThEVLv7X3z/r+phHsA3YmCBUQIylzJuWx8BUAuh1WKwK5AuNjiOtq8o401R+?= =?us-ascii?Q?WkZSq3b8smy3uOGNrtqYOk5GTMuzABUtIE5dKrguMkWYZ7HkQ3zMwhNsJnC+?= =?us-ascii?Q?9RDVPKJkxJuV5G+yqm51FJzLqIbe54aJb5Utv0dIS?= X-Microsoft-Antispam-Message-Info: e675H96fDcAmkPtknjkLkGYwzqmMjFpzwf7110bwG8+DOvdUmfjCMGhwWXzaVt4tgliaGjAHALOXSvMqG823eQuyzK8Nhrrl8ev5Qk/DptJqMKvLdFbxbwpXBHljhESF8N0ZF8qfFK5dze/SsoGC57SUwvZon1r8cA9/P4rrQry1jgNp8YhEwcc6/G8qGjew X-Microsoft-Exchange-Diagnostics: 1; SN6PR1501MB2014; 6:Suhzvm3Yb0kGvbWUmYkv6d87cyaX6ZO+WMEJcup78nirDaK1SUAholc+mZnFXYXSmHy7t8CZuyoN4hkTeHQmdjzrh2OTqaJ6s6FgA+O8+ZDJtXbp4CTgdUmrF2P7Q1lRKZZ7p0lpxHZd0Q2CP7h/QEqTEdcDoiQKl6UOMOTNjWebCpI8lcikCid4H30fT80sGYH8tkitT00F0R9Llq4tuIhU9E1IDvIg55Ipa87hC97E8mIJgC101CCtmr8ww4r9oPPlTB935abz9sGuTXsY2sN5kPDstsZKiRzJBZD3piD/UqO2QdPM6AcSKM2QpT2AhDO1egWTFhDsP+EtgCKnjiHkZveLJ2uTvfDS39K/tR0=; 5:T8JKdUuTeuIrznEhySCQRvurvSoTBdj1GGGxW2N7eTcnj0Dzlq7lA1IMiFbahvpKJjzXLzuXD9+3Da5rG41jGkVj2A8jOjHHTG6H6bX8ZQ9Km5qvzk1BgkTIdSO/MrBTETPyzziZirKqGelKn8MPZhHEAVkB91L5VUP1fuhXt8E=; 24:TTRgxWIg4NPT0bNpwbAoFMu/eXAjaVvMfRq9RxmRrPJp/Lphv+hsl7ApVSiT4/XkOU/HNGRBSD7hnbeJ+G384Hn+09x9v+QXO7iIlaJ7Wx8=; 7:eM1J1sDauupM5xhlgF2xh3duClSpmRCQKePWXzbgHaAg47FKVh57RgsamOKl9urXpBUQq/yZmF1DqyXdI9QtwJF2x9klQX16TMrwOQS1amcrAiExxsBSp1P/nHXz0FSv1i506FCPYxMu8K9R43oMCjwRqykCTaWPHuBv/ewTmIihWyRJgsgWZ3Y0lMgIYX0Kd8Q9RJYjSoQVl1/LIuAEBSSYtLyRrJKzQzeNmHtVdS8A8JavQL/V/4KJxVWtMo+i SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2018 21:25:34.4592 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 174ed158-20dd-4df2-1459-08d58f7248f0 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR1501MB2014 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes From: Simon Marchi This is a straightforward replacement, no change in behavior are intended/expected. This is the last usage of VEC(char_ptr), so it can now be removed. gdb/ChangeLog: * guile/scm-utils.c (gdbscm_parse_function_args): Replace VEC with std::vector. * common/gdb_vecs.h (DEF_VEC_P (char_ptr)): Remove. --- gdb/common/gdb_vecs.h | 2 -- gdb/guile/scm-utils.c | 13 ++++--------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/gdb/common/gdb_vecs.h b/gdb/common/gdb_vecs.h index 7318e53..8bb7015 100644 --- a/gdb/common/gdb_vecs.h +++ b/gdb/common/gdb_vecs.h @@ -25,8 +25,6 @@ typedef char *char_ptr; typedef const char *const_char_ptr; -DEF_VEC_P (char_ptr); - DEF_VEC_P (const_char_ptr); /* Split STR, a list of DELIMITER-separated fields, into a char pointer vector. diff --git a/gdb/guile/scm-utils.c b/gdb/guile/scm-utils.c index c31afc6..73b0dec 100644 --- a/gdb/guile/scm-utils.c +++ b/gdb/guile/scm-utils.c @@ -386,7 +386,7 @@ gdbscm_parse_function_args (const char *func_name, SCM status; SCM rest = SCM_EOL; /* Keep track of malloc'd strings. We need to free them upon error. */ - VEC (char_ptr) *allocated_strings = NULL; + std::vector allocated_strings; char *ptr; have_rest = validate_arg_format (format); @@ -419,7 +419,7 @@ gdbscm_parse_function_args (const char *func_name, if (!gdbscm_is_false (status)) goto fail; if (*p == 's') - VEC_safe_push (char_ptr, allocated_strings, *(char **) arg_ptr); + allocated_strings.push_back (*(char **) arg_ptr); } ++p; ++position; @@ -485,10 +485,7 @@ gdbscm_parse_function_args (const char *func_name, if (!gdbscm_is_false (status)) goto fail; if (p[i] == 's') - { - VEC_safe_push (char_ptr, allocated_strings, - *(char **) arg_ptr); - } + allocated_strings.push_back (*(char **) arg_ptr); } } } @@ -516,14 +513,12 @@ gdbscm_parse_function_args (const char *func_name, } va_end (args); - VEC_free (char_ptr, allocated_strings); return; fail: va_end (args); - for (i = 0; VEC_iterate (char_ptr, allocated_strings, i, ptr); ++i) + for (char *ptr : allocated_strings) xfree (ptr); - VEC_free (char_ptr, allocated_strings); gdbscm_throw (status); }