From patchwork Sat Aug 5 17:11:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 21933 Received: (qmail 95280 invoked by alias); 5 Aug 2017 17:11:32 -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 95253 invoked by uid 89); 5 Aug 2017 17:11:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.2 spammy=Hx-spam-relays-external:sk:sesbmg2, H*RU:sk:sesbmg2, HX-HELO:sk:sesbmg2, H*M:ericsson 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; Sat, 05 Aug 2017 17:11:29 +0000 Received: from ESESSHC010.ericsson.se (Unknown_Domain [153.88.183.48]) by sesbmg22.ericsson.net (Symantec Mail Security) with SMTP id AB.FB.05732.E3CF5895; Sat, 5 Aug 2017 19:11:26 +0200 (CEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.48) with Microsoft SMTP Server (TLS) id 14.3.352.0; Sat, 5 Aug 2017 19:11:25 +0200 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from elxacz23q12.localdomain (80.216.43.226) 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.1.1304.10; Sat, 5 Aug 2017 17:11:23 +0000 From: Simon Marchi To: CC: , Simon Marchi Subject: [PATCH] remote-sim.c: Fix arg variables conflicts Date: Sat, 5 Aug 2017 19:11:11 +0200 Message-ID: <1501953071-28201-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-ClientProxiedBy: HE1P190CA0059.EURP190.PROD.OUTLOOK.COM (2603:10a6:7:52::48) To DB4PR07MB316.eurprd07.prod.outlook.com (2a01:111:e400:982f::24) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b23b7f83-9c8b-4ddc-00cd-08d4dc24ffe5 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(2017030254152)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:DB4PR07MB316; X-Microsoft-Exchange-Diagnostics: 1; DB4PR07MB316; 3:jWK5Q9JYHQ2kIrkJYZgtMtFlNGi3upu49sByhAaS/Fs2xLewQbDOaXkTORIbxqZ39+92rEga3TBWcUfFkMcpKVepwf1vmTdLbvMazKVSlGocFEIrIv1XGs9PpTvGuytxse9r9C0M/tV8rtOgdiSr8P2zv3QZAW/glm93EGJ3TtkdYa50yoveZ7qBY2xuknqnxwf/DiBH2oDfwG7GsBZLd/oN3GQoFg3lM45zQ9LoKd5rq7Rer6sfkKZ16JqsB37R; 25:AuA7BQnwdmAARGtRn8i9xCrUbOFCRsdA/5XKt0aM+El8UsgJHIkxLGUjR891gAG/l/3l/dkz7I+2IGi07kv7mn69X4+7Lh1DpL1WA0Y1FnwwQWbtvHCYOmJMTWKa3Kay1ZgVkumNGK70WdNTnPLQ5koqzRaKOyK9I9ZxYFqNr0ttawXQ7vD+r740hQ7Iklf/1t/NqneZHkU8mPKJOCGIFjYq/IO4cN5vNGzyjy2P1KZETXT4ZTaUK+z7G9ljWuSTq3Sps7pBua7qUt60iXTVluaYcR75lgPJx8061NQ9wla7cQOCiov/U5C4Bpzso7mH6aEci1gar5g7POzpP5UMDg==; 31:mU5RTszTaehP7i2Y5dQ2fe6HlSyYjgXCzX9kEaZmhSmk5eTikosW1A2KjVVkdVwdymKhU9b6EWnJy2AzWx5wYoIncRCQT65inFp81PapYYVBoeT4JyMwWijgYoMKMwD8FNanNJVb9NDMYlXIAWZaqkiH4GcAfM/DLvHOnLQT8R+qvaWjHb9F/k1qKNuK/MRNbShKBZIX5OlA1URC2q9JFlgt1MQ0gXygDTr650yEPgg= X-MS-TrafficTypeDiagnostic: DB4PR07MB316: X-Microsoft-Exchange-Diagnostics: 1; DB4PR07MB316; 20:OR3JbghhR2zherojUTFrOobX3nPcHi+5EBdnKV1OzwSLBFF9mcd8j9PzVz/vW1a8RkKkhv+PEQw2CXsgg+/J6kWNZXYe001+XPg7G/2Yc3RWb4Gr2Brj85vuFECw8rtR/oTOCzCUMupwOgXDzjieW6U2PdX4vWDZRvvXOQZforRmN7Agid6zCnPtLLRkievI1qVt+vBiWRuZgqx+yN8FqRerRNt1i9uhmkd74F7d3FxJxXxTPp6KttYU8ELyC2uZLCCNEvStgeO0pJrZCqYSJMXYICbQtoi01OXP40Rd1fs6itGSsrwdLgjhiFY2vvDGojxnI4D4zU2CDwgtvjvBHi9gp0dwEA9VKDv5H21s6CeH/1eiKok7oedDS2L5DN3z+A4QueDNYkcKCMdUxNY6n0AQ6mgRMG5j+QTXhNrTHuyFCwLSbFc8USD3FuAl+dG2FhGrNV5Q31PSvauEvcCbGFtF3hEWMeiMAzNzE4/9rXfB7qR61Ql7jpUlpNRM8+FJ; 4:QpGrkSVLfzuIly/abqYAAxabPDV6Es67MrPsf1pTFJcWcUkt8rHVd6WHDF+KJrAN/mPdl6tUqsFrng/K3MF+MsP8HTiwUeIkhneVwk0abjElnYP4hotI5SQuWpZcQFcK+0gvUczg2AQB8o5rSowh7PSOK9W/PTgXtmLeHQvS/0P91OtmN+7dshcXexriew3VjyluDMF9zDAlN2leH1t1KZzQd6sIOzqE+MXAOqIjkOhLICCS9/w0OGvBx+i6OuL9 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)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(6041248)(20161123562025)(20161123564025)(20161123558100)(20161123560025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(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: 0390DB4BDA X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(7370300001)(6009001)(39840400002)(39410400002)(39450400003)(39400400002)(189002)(199003)(54534003)(2361001)(66066001)(4326008)(305945005)(107886003)(478600001)(110136004)(47776003)(38730400002)(25786009)(2906002)(50986999)(6506006)(101416001)(7350300001)(7736002)(6486002)(50226002)(48376002)(68736007)(50466002)(8676002)(6512007)(53936002)(3846002)(6116002)(81156014)(81166006)(5660300001)(86362001)(6666003)(42186005)(5003940100001)(2351001)(33646002)(6916009)(97736004)(36756003)(189998001)(105586002)(106356001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR07MB316; H:elxacz23q12.localdomain; 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; DB4PR07MB316; 23:oOI3+Obng0xaBLY0OGKmpYhZMqSXvZEl2dcUpWHJoV?= =?us-ascii?Q?nC2dp422jkhSxegLkhE4Jr6EvHvD2KeU3HoyNPeE/wnqXLwv2eUUIAgHhHS3?= =?us-ascii?Q?3s/sRu/j5vyNuPanLRfEyvP6B8u+01GhEJl81D6WbOmT4/eqEjSb6H48bojU?= =?us-ascii?Q?3BCcHWDTunM1eLXrZ/xKn2v/P9sShx/EThdQGNDVr5iDiSgbvTzCH5sB5b0F?= =?us-ascii?Q?eCuJjYNOFpkEL4+tt9ewMftbLazm0+ADaIc5D2zQPYbKAGUw3fmPc72O3vxw?= =?us-ascii?Q?qHnziaeBcxd0FDvH0oJfNTQ3xSjj7dTvRyrrN/fx15hofYVIQfCDZ+ZsV1po?= =?us-ascii?Q?29VdsDN7tG/zU0cQA+h9Wv2aIrbSQYlxVc7HmSa13F4+l3IRgxSZcFuuT0Gq?= =?us-ascii?Q?L9WTy1w4DfjRuaneKd8NKMdfiBaUf9B6X0VGhqTlHw4CNH8RTYSIqOT3H/5Y?= =?us-ascii?Q?bYh63Cp/QVUFnC/1hoQJfY0++Q1bBhzAZ+lC+6M6uK4jrskwDZGQILRNi4oN?= =?us-ascii?Q?thLKmy3p0DpDbxqp+63eFiU+YSyyniUOPFdENQs/nv2945UbP4vzT/iicU5w?= =?us-ascii?Q?hKOeL8dswrBeN2Nf50ewUxcT8ep9eNxyiyx4dWX/kII6jDCf7LXgiFRFhQJh?= =?us-ascii?Q?zJEyl+zR+HIJ0eQ0cZSfF/MxidSefVLZag90hV/iaE+Fnq4jLUl272NJFG/m?= =?us-ascii?Q?/ND2eDBwfQK5NAYrLgI7MOeUvlklUc4t2dRNnR9v1Lu1fOrANJlwrv6L+Azu?= =?us-ascii?Q?2qHnSij+JUuQY1JSqfT4FaOEYkttpwHaTRuRmAWoqYr5jTpD41GS1NKr80Zc?= =?us-ascii?Q?EVta2GBnJoABAlkfKhlB8i6oBxw00Q+XNO0QXYxsLlMepNXofS+INGwfb8un?= =?us-ascii?Q?QNpdwmNIBbxGmp7ESAFGmKcu+reYxclHWS0SqrrTRJ1OenjNGvo3luxWmAa0?= =?us-ascii?Q?bGGNP2G415CkrhPtx7lkgFbX+NQ9FwLtkwNojiM/tHk891VAD75TWR1XkOwR?= =?us-ascii?Q?+0jeKcb9E015JHYZNNmXIyXm/BY37FA7nNLXJakbETbBdLm3DNyUfmV4kZMJ?= =?us-ascii?Q?upTTcOx1j1+KykStLHcnyPnD3hfx9cQ0PQrcYCLpoYi/HD5mEcvsCup1gE9B?= =?us-ascii?Q?7xI+ojrC1zr99Yk2Sl8ITyQ5uKmGTpCB0iqTevclOyidQF5yBhhbA1bJb40w?= =?us-ascii?Q?ehnsOkt7rM3Hbhl+5tgfOXVZzbGZIqlOz4qp4LU1Qgt3FxzcbhEq1/Os546+?= =?us-ascii?Q?7HjVUyKc75d4LRjRc=3D?= X-Microsoft-Exchange-Diagnostics: 1; DB4PR07MB316; 6:iTYLVWj7vWTZJnfsrYSeBJ/3CrB1RltY41JFhecHSLNE3N0Ox6+WQu9HbH87jOpbFzrs3XCLDaNwGwa5OL4a/FiK3pgb7H7z6sxnnvoQ9qihQD4ZOxLD9kj/4bAgc7XNhYs9JmlgHe0a0R/sq7jIwJTRwYZNcOQ9z7opw0JZ6qlPQ3R8rnbY+G75cjf1hcgT10EJrK6pyC0wjUZujeG8/Rd3wSAv0CXt4ccURNVDRp6X5T8J7N5XoAF4H7OA1EB1yhs/ssBh7ZUujz/1h2AeWGRdYNlOtFoO8UYkn9PddPqvE2aZACsiuOhnFH4zXZpAIQOrsbid20F7WHSD3y+rng==; 5:qZ+zoPZV0z2nBZZgRGv3AImhmbZB0kY7IN6Ls3JO7MoebeekKFQwADnLDgVIRNb/utf5Vu993ukGWTVcnCuxXp118kOacEt7nkXYRFWOMchK9rc2YwbsLqIfQM9l53ZR3ayShmqTKap39DpmvZSZhQ==; 24:JwWVCP75R5wOZC5j7rVme7RdYHt+FNdbNXn/Ep4FNyT6Bk9WteTlB789QOjVdZ5IZ8H024RjvrG7SwSpoizwSO2/T8UrlyulCveibXfVigI=; 7:Z5Kt8ZUDoRj8PgzDBz5cxsyhEsq0KWiuBn53QbN8GlYE9JifU4Nspvubzct3ih15rWxeEtUxw+vuTgP0YlXIXHXuvGpnrw/r8MyUOOusQSg5kjNtr3jX11uw6q3gMyyZk9n1qvmUKuawNh7D6mTs4a84Bc8XqJy6vmapPENrtgtFyZme4kcD6zY5Qmd6yaodV0+veSbBvUzmvFfa99gGSbpRkxoqKHF/CLH9PvIpUOU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2017 17:11:23.2463 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR07MB316 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes The recent change introducing gdb_argv introduced some build failures in remote-sim.c. /home/emaisin/src/binutils-gdb/gdb/remote-sim.c: In function 'void gdbsim_load(target_ops*, const char*, int)': /home/emaisin/src/binutils-gdb/gdb/remote-sim.c:573:22: error: conflicting declaration 'gdb_argv argv' gdb_argv argv (args); ^ /home/emaisin/src/binutils-gdb/gdb/remote-sim.c:565:10: note: previous declaration as 'char** argv' char **argv; ^~~~ /home/emaisin/src/binutils-gdb/gdb/remote-sim.c: In function 'void gdbsim_open(const char*, int)': /home/emaisin/src/binutils-gdb/gdb/remote-sim.c:730:25: error: declaration of 'gdb_argv args' shadows a parameter gdb_argv args (arg_buf); In gdbsim_load, the new gdb_argv object conflicts with old char **argv variable. I think the old variable should be removed. In gdbsim_open, the new gdb_argv object conflicts with the args parameter. This patch renames it to argv. Built-tested for a mips host. gdb/ChangeLog: * remote-sim.c (gdbsim_load): Remove char **argv local variable. (gdbsim_open): Rename gdb_argv args object to argv. --- gdb/remote-sim.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c index 75b1f56..ca824d7 100644 --- a/gdb/remote-sim.c +++ b/gdb/remote-sim.c @@ -562,7 +562,6 @@ gdbsim_kill (struct target_ops *ops) static void gdbsim_load (struct target_ops *self, const char *args, int fromtty) { - char **argv; const char *prog; struct sim_inferior_data *sim_data = get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NEEDED); @@ -727,8 +726,8 @@ gdbsim_open (const char *args, int from_tty) strcat (arg_buf, args); } - gdb_argv args (arg_buf); - sim_argv = args.get (); + gdb_argv argv (arg_buf); + sim_argv = argv.get (); init_callbacks (); gdbsim_desc = sim_open (SIM_OPEN_DEBUG, &gdb_callback, exec_bfd, sim_argv); @@ -739,7 +738,7 @@ gdbsim_open (const char *args, int from_tty) error (_("unable to create simulator instance")); } - args.release (); + argv.release (); /* Reset the pid numberings for this batch of sim instances. */ next_pid = INITIAL_PID;