From patchwork Wed Nov 15 16:12:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 24256 Received: (qmail 26594 invoked by alias); 15 Nov 2017 16:13:03 -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 26585 invoked by uid 89); 15 Nov 2017 16:13:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KB_WAM_FROM_NAME_SINGLEWORD autolearn=ham version=3.3.2 spammy= 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; Wed, 15 Nov 2017 16:13:01 +0000 Received: from ESESSHC001.ericsson.se (Unknown_Domain [153.88.183.21]) by sesbmg23.ericsson.net (Symantec Mail Security) with SMTP id 47.67.08439.A876C0A5; Wed, 15 Nov 2017 17:12:58 +0100 (CET) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.21) with Microsoft SMTP Server (TLS) id 14.3.352.0; Wed, 15 Nov 2017 17:12:58 +0100 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from elxacz23q12.ericsson.se (192.176.1.84) by DB4PR07MB316.eurprd07.prod.outlook.com (2a01:111:e400:982f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.239.4; Wed, 15 Nov 2017 16:12:55 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [pushed] tui-win: Replace VEC with std::vector Date: Wed, 15 Nov 2017 11:12:43 -0500 Message-ID: <1510762363-2520-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-ClientProxiedBy: HE1P18901CA0018.EURP189.PROD.OUTLOOK.COM (2603:10a6:3:8b::28) To DB4PR07MB316.eurprd07.prod.outlook.com (2a01:111:e400:982f::24) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6737623e-da38-46f0-1b8d-08d52c43bbc0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:DB4PR07MB316; X-Microsoft-Exchange-Diagnostics: 1; DB4PR07MB316; 3:ZMzMyHFXFMow1KRgvv7Y0+Q43kMb2nX1e7rNhhXCZt7L9K7VtkYa6+IJkBK2rtSY22sCtYUfjJ55LW7cOqt8Ko4xHL+vMKQHmGEU4+IFDM5P0WvIxMfGWBOTjRewRSCbI3kIgRfWezYPH7fjBVcwFYHEbgZ1P7XluzX5OWDilTyxwke+kxo4sUeDoXUKyxjoYvawjY/b83K9psqlDJzJ6xYJaf2wVgrw94e0ezbvuVC52a4cxEhPNd4L4vKTBfAW; 25:6u3NTSyfcakU0HADR/4d7s4CrQQqQvHwLGE6a9oUl6rK8zZOVTwcswez5FvPE3PNU7nThzxHngt0Otm5Vya/0eoDOc6FDvLHWGo8tp9h8dxnJRSofQaMOl7oQJJjIeEXSvwhF7tHmpivIP9LxBJnyNSm8KBdsElJzPK2HFB3eitfl1WTlxcDrKpGMmjT5eDKAh3gD3y2jNY34HcR4BwWWgsP7g7QilZrSx5KUW5MS79gqV8A0PW3Lw0OHsYljyCuwRE0ATbL4OmRRWLMvV2MS629Udc8YyATNvlKE/flZwKk7JhbONjPA1Kfv6ybRSOvWyt3qo3ZKCS+KZjrYGv8ycP6rP5Fm8DaBq4zw2jcGQg=; 31:iNetJoBp2hkCVFEWC4/5K+7qe2nV0nEFj+kLadf5n9uTWmPnFMDR7199pJE8uycJ/AC+FKCgubY/x6W9VVQy0xJcUtILSTLqljKqcXrNTN0rP8LdTcQxGyohbmnx0veNFo6W6mAHrTJQNvc9K17gciv/4D0kOTYpv6+5WXSvNLi6DZn82V8lIRZdtOX8ba84k5ZfUSBX40QyAe5wolei1R76LCyrY1UdeYBU747XF2g= X-MS-TrafficTypeDiagnostic: DB4PR07MB316: X-Microsoft-Exchange-Diagnostics: 1; DB4PR07MB316; 20:tFW5MpKupkgpCr81pX+atdu0L+lg1qYleOQ7HyNfHDhNjz9+pFpUHxRUZ0V9wBdG5KcVzjKU7kMY0NlDmNKy+IpJeV4lYyHW/VdkBGRmG4n295aPVE5X/wxGKBLg3i3iy2G71yX7zL9BSjT++aPQ7RCtrQUgSSUccso1Ww1DhQc2YMg6u3UAIOOC4GgvZYQkVPzP2lzaJwR9dFGWmolhhNpv2S8kT/zzSkzBHpkTQrtoBtjVXgMt6zWoOJErLMHBZyyjFGkcZEuqcvxgWDv+ChSSA6/OITfCy+4c6nd6RA2rOH8BhIBGZSe6nDWypVQ9z6MShVCWgJ7/391RZBXQrnB2gEJI4Og7jpLvYnJvpxpZD2NgWki7s3RwYVoxx5giz1SSfpVftynIzbQvFAsGWWeIWlwRrunDMAi9foKLx6pVhqwrL7MQ4cEYBNIkyq9QcpmiC4OVr31bf+Rz0dMtxPMpE0haOZUIlDGzx613jYHntD1Xw4+CHWQnJtI6RXKh; 4:59bZgv7XR8DKeePcqh1gpwr8toxUrOtgcgvpnzjkcpaCvtMof+qRCYVSG5LPH2coV824kztj4jNzu0fPezsPGioE89TsnYZCcNhDrty3JoBykPJ/BXhKOO9hVGZdLkoDIuCUosfmRzrwJ/xRdut9B7dcsRrY37slns0/55V7NHdXFDkEo+PfDsBBaFSLlqY/ItQV4NzNe3XXl4QPjR/ib7dsupt6PnOzzRlfKYeU8mK6ntQeRmFVmvtNxGa0fPscJ0Y+rBVV6TWX7YBaU9vt4IdilDMIcpI/YHcv4+/KTO51YdSolgmcIrU8R2NUpXO7/CLhDXM7rdqfNDI4OxgWj2U52myEfDCQA/t/P0jLUEnMReOwW2rTpSfKFvyHuMUr X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(37575265505322)(22074186197030)(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231022)(100000703101)(100105400095)(10201501046)(3002001)(6041248)(20161123560025)(20161123555025)(20161123564025)(20161123558100)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DB4PR07MB316; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DB4PR07MB316; X-Forefront-PRVS: 0492FD61DD X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(346002)(376002)(199003)(377424004)(54534003)(189002)(2906002)(101416001)(4001150100001)(305945005)(47776003)(97736004)(81166006)(50466002)(16526018)(53936002)(68736007)(3846002)(107886003)(6486002)(105586002)(106356001)(53416004)(6116002)(2351001)(50986999)(33646002)(48376002)(7736002)(81156014)(66066001)(2361001)(8676002)(6512007)(25786009)(5003940100001)(36756003)(69596002)(6666003)(6916009)(5660300001)(86362001)(6506006)(8936002)(16586007)(478600001)(189998001)(316002)(4326008)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR07MB316; H:elxacz23q12.ericsson.se; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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; DB4PR07MB316; 23:Qe8vbxtW7u/LvTx4I9JSFPkpAOmZ8kZDCao1pU8LsW?= =?us-ascii?Q?CegeIPRhzb7S7MrsBeo4Lu4qXpeMKjPqfkd2FQx7z7aQCYf+oWsbpyYLhFEP?= =?us-ascii?Q?rYaR/cbVnp3gf0SAiKqipc1sk/omijD8/6pHgeBCDD/ZA4yZWtorSx/GlWdi?= =?us-ascii?Q?MBm+ojRsYiHjgphKz0/93Q8yuqqRMYA+dFR9ffMMMYaChuu4i6f1XNSeOe1Y?= =?us-ascii?Q?2gPckMPvil0fwPKRX5z+sgVXfPSUsMD5e+PDoFCg6Yos9lSnNN1TZOPJZOoE?= =?us-ascii?Q?mNVqvwIT5bdxqrBw/Z+YPDxDiHoUNuR4zAnBv7L9gO69XnhGakptIIjR3BRW?= =?us-ascii?Q?se9LuSF7lWdZ52V1fEq7SI1Z1NMiN4+zM6I++VwuRUt6Gf9/vE4twV5v2UTv?= =?us-ascii?Q?/kHL/opueK8JPJXOD4lhQSD4rlv2OGyTdKnvkUwlAUBoRdaj7N+fWq7HZ+EO?= =?us-ascii?Q?FV+PawUl/75RrYMAozJGLzoJoUe39kNWd+mdxCseQSFyFjN1AgIhBOsKt5Ox?= =?us-ascii?Q?TvBPmFLXKCLT4/0xE1ojnqPIlBDnJt3dbt72lkSolFIaJ4c5TlkdmYYNVbkP?= =?us-ascii?Q?8ho5vC+PsUMhmTQ0EIzKncUUluHMgVvCBV1fV2KtXYz5VR4eRfpwQsE+5wnQ?= =?us-ascii?Q?gfiNXQElsacNbxJZQCMn5QScGMyo52Poe6jf5VzXK4DaB5pMUIJSd1E93Yd+?= =?us-ascii?Q?rFwYYO4twX8EXCpV2Cg3obrljDdHduORICgxbjcmAJ6cWOOSRIo5r7SxxkuD?= =?us-ascii?Q?o2u1S3Gj58OmDC8IudyZ6FO35SgDbT1AOFNEvaUTgu7FxvZ1XazplOlIo3qN?= =?us-ascii?Q?ecJzfDoPCfIOYI9pTHU2kD8sOqUI9bYQab/2eq9cNAgAJh79Z9LXZHDAphRB?= =?us-ascii?Q?Jt5Kml7Ddhhv8RsP2QjoeYk2q4FBqRykUyJb8UQwPul7OWdorFApz4buFNNQ?= =?us-ascii?Q?H2jQNdRaE2ejb4QiefQVE1sBn5BLSs4hx9gpx8n1EcvSDjOy3EDuQaRm7apc?= =?us-ascii?Q?jeQyvoQA7oaTv9VVd2yYza/CykTjVZSiPdorIdR87C/abEMSuU2wdjEFF9mS?= =?us-ascii?Q?BvSKDLSRTsW0o4ziN/k8+u62rL4NXIEh74Sz6m+McNl7hDs584rIgFIoMh+9?= =?us-ascii?Q?ZTdYlcYjESLfU55d0ihXnC4ydp2Z9lV7EfStX16KAejG7t64t1rKdv+ulFlv?= =?us-ascii?Q?qEYwXLiCS4twON1Z+3W6Dkgb0GAsWhqkhpjim8Hn+qeuBe0xePBb7bqA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; DB4PR07MB316; 6:99Tmdp8WyETV3ijFZcqMPbBooBO1y4XyHKTwLNYnWaxNN3jZPhXi5ZtyFnfnCnTeVqHhG5oXgm2G+67an8Zd2ZENj5+doTraFQmRss0r2lS/lxCVtMDlIMChuGK+xH5cooOgNMw9852dunvIgh5caHqWbwIsvXPLYXsNN+60+Hf6pEawbWlkE7xLgevIxYwNibXrUk5NRIjylIpeA2Fo18yK7jTofjO8dzM+WLjSpmNpP+NTPEXtKjTv6qrjYyPBThxW8tkC2Hyfa/T88RzVtkTWGE1N3JIEgXpTK5qcnjY5R8PD/ivcekIVAViOIbs33UMl7VP02CDamZootF3XbFZjs0hTNUZHdUZgyTCP66c=; 5:iQpcjCCZhZ21afi8d1weeKWAHJAWEJDHKg/WavJHfm4+ecvx4gn/xZ6UDcCEGlqe9zp6takVTWaTAL+T3y7Slj/RMhAUVTa3kJBRk2wdAVhGR7fIq3I/RmLs84hoa7nKFuqR1H8pkLGyvoAxnTYb3JAjZ+1xgKu8iwgskG2kQZ4=; 24:4x0u0mnROJOFWzq3OylNU5Yevg5UrZnkYVTNCh1AR45Sqj+LotDBNi1ZDMaobyIowF9t9jbE8MfcVxjxsHNWvvZ0G69JDYPk9Teja1rdKc8=; 7:5qKShZLcXhAZr85Cs/EWQczSda2h/PsgGltMTvZzqMDRyf7Aze/3F+2sEYk6tp45nb3uFbbP0HUjYaFuPJ9zDzRB9EhDp475WKM5epRISGSC9rjqLdCTwEy21TjwY6RUdjPgaNBi3jQJmQyfT/rbJ52N7rB2SdFiFpMGLaZV28elkQX3j4Cg9/t+tocTUdy2h+GVZn2NgaH152qIk7xUT7KfCmBx8A4tOJvyc6PmP2ccBcxmuph6dwv+JhE2Bff+ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2017 16:12:55.8872 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6737623e-da38-46f0-1b8d-08d52c43bbc0 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR07MB316 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes This patch replaces an instance of VEC (const_char_ptr) with std::vector. Tested by running gdb.tui/completion.exp, which exercises this function. gdb/ChangeLog: * tui/tui-win.c (window_name_completer): Replace VEC with std::vector. --- gdb/ChangeLog | 5 +++++ gdb/tui/tui-win.c | 21 +++++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5105df6..9b1c335 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-11-15 Simon Marchi + + * tui/tui-win.c (window_name_completer): Replace VEC with + std::vector. + 2017-11-15 Andrew Cagney * MAINTAINERS: Remove no-longer applicable entries. diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index cbeff1f..3694a22 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -365,7 +365,7 @@ window_name_completer (completion_tracker &tracker, int include_next_prev_p, const char *text, const char *word) { - VEC (const_char_ptr) *completion_name_vec = NULL; + std::vector completion_name_vec; int win_type; for (win_type = SRC_WIN; win_type < MAX_MAJOR_WINDOWS; win_type++) @@ -379,31 +379,28 @@ window_name_completer (completion_tracker &tracker, completion_name = tui_win_name (&tui_win_list [win_type]->generic); gdb_assert (completion_name != NULL); - VEC_safe_push (const_char_ptr, completion_name_vec, completion_name); + completion_name_vec.push_back (completion_name); } /* If no windows are considered visible then the TUI has not yet been initialized. But still "focus src" and "focus cmd" will work because invoking the focus command will entail initializing the TUI which sets the default layout to SRC_COMMAND. */ - if (VEC_length (const_char_ptr, completion_name_vec) == 0) + if (completion_name_vec.empty ()) { - VEC_safe_push (const_char_ptr, completion_name_vec, SRC_NAME); - VEC_safe_push (const_char_ptr, completion_name_vec, CMD_NAME); + completion_name_vec.push_back (SRC_NAME); + completion_name_vec.push_back (CMD_NAME); } if (include_next_prev_p) { - VEC_safe_push (const_char_ptr, completion_name_vec, "next"); - VEC_safe_push (const_char_ptr, completion_name_vec, "prev"); + completion_name_vec.push_back ("next"); + completion_name_vec.push_back ("prev"); } - VEC_safe_push (const_char_ptr, completion_name_vec, NULL); - complete_on_enum (tracker, - VEC_address (const_char_ptr, completion_name_vec), - text, word); - VEC_free (const_char_ptr, completion_name_vec); + completion_name_vec.push_back (NULL); + complete_on_enum (tracker, completion_name_vec.data (), text, word); } /* Complete possible window names to focus on. TEXT is the complete text