{"id":22571,"url":"https://patchwork.libcamera.org/api/1.1/patches/22571/?format=json","web_url":"https://patchwork.libcamera.org/patch/22571/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20250114182143.1773762-11-pobrn@protonmail.com>","date":"2025-01-14T18:22:37","name":"[RFC,v2,10/16] apps: lc-compliance: Use `std::vector` for argument array","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"e57e97c060297a790ec3c51301a9eb97df5aecc5","submitter":{"id":133,"url":"https://patchwork.libcamera.org/api/1.1/people/133/?format=json","name":"Pőcze Barnabás","email":"pobrn@protonmail.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22571/mbox/","series":[{"id":4951,"url":"https://patchwork.libcamera.org/api/1.1/series/4951/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4951","date":"2025-01-14T18:21:46","name":"apps: lc-compliance: Multi-stream tests","version":2,"mbox":"https://patchwork.libcamera.org/series/4951/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22571/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22571/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 3D5C3C3301\n\tfor ;\n\tTue, 14 Jan 2025 18:22:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EF41268521;\n\tTue, 14 Jan 2025 19:22:43 +0100 (CET)","from mail-10631.protonmail.ch (mail-10631.protonmail.ch\n\t[79.135.106.31])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 13CB468521\n\tfor ;\n\tTue, 14 Jan 2025 19:22:42 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=protonmail.com header.i=@protonmail.com\n\theader.b=\"yefhomab\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com;\n\ts=protonmail3; t=1736878961; x=1737138161;\n\tbh=kxP38QZSOBzAjSi5XVjbBN6zbKB0FhK1k+izhC27p3Q=;\n\th=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References:\n\tFeedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID:\n\tMessage-ID:BIMI-Selector:List-Unsubscribe:List-Unsubscribe-Post;\n\tb=yefhomab9Yh0Ylb/susA+aXba5/Z6OnEtbBH/8kHrbnk/mBg41qFXZVpv4645mtWO\n\tEBEIpMqoV0HvKvOokhTzh8XHZ4PEo11lgB1+kXnzyEIAJScv5xoIrCp/i1vMWAgAEx\n\t3/1tBmZ7kTtqtPXmQS4iAXpTl7kWKNFDsX0lvzENx6jgJm73n4JoR83VeYFGisWK6z\n\t7JaanB4PAtvXfd8/8NoNPKiI3QnWEovmP4lHWWf6RWTtcg5VLBU209cCYngw8r7dcV\n\t6jr/49GCNm2jNelw/y3dC1TQOA/atkkD9YuI+jhXaf3qq9evOwnCpeuZhRM3Pra5Co\n\tnWPO1cFe8dibA==","Date":"Tue, 14 Jan 2025 18:22:37 +0000","To":"libcamera-devel@lists.libcamera.org","From":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","Cc":"Jacopo Mondi ,\n\tPaul Elder ,\n\tLaurent Pinchart ","Subject":"[RFC PATCH v2 10/16] apps: lc-compliance: Use `std::vector` for\n\targument array","Message-ID":"<20250114182143.1773762-11-pobrn@protonmail.com>","In-Reply-To":"<20250114182143.1773762-1-pobrn@protonmail.com>","References":"<20250114182143.1773762-1-pobrn@protonmail.com>","Feedback-ID":"20568564:user:proton","X-Pm-Message-ID":"8f3260dec7bc043f529ad786d4e2c72ceb95d0b5","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Transfer-Encoding":"quoted-printable","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Just use an `std::vector` to store the arguments passed to\n`InitGoogleTest()`. This removes the need for the map and\nthe separate `argc` variable used for size-keeping.\n\nSigned-off-by: Barnabás Pőcze \nReviewed-by: Jacopo Mondi \nReviewed-by: Paul Elder \nReviewed-by: Laurent Pinchart \n---\n src/apps/lc-compliance/main.cpp | 36 +++++++++------------------------\n 1 file changed, 9 insertions(+), 27 deletions(-)","diff":"diff --git a/src/apps/lc-compliance/main.cpp b/src/apps/lc-compliance/main.cpp\nindex cdd0bd515..e9f0ffbb5 100644\n--- a/src/apps/lc-compliance/main.cpp\n+++ b/src/apps/lc-compliance/main.cpp\n@@ -80,45 +80,27 @@ static int initCamera(CameraManager *cm, OptionsParser::Options options)\n \n static int initGtestParameters(char *arg0, OptionsParser::Options options)\n {\n-\tconst std::map gtestFlags = { { \"list\", \"--gtest_list_tests\" },\n-\t\t\t\t\t\t\t\t{ \"filter\", \"--gtest_filter\" } };\n-\n-\tint argc = 0;\n+\tstd::vector argv;\n \tstd::string filterParam;\n \n-\t/*\n-\t * +2 to have space for both the 0th argument that is needed but not\n-\t * used and the null at the end.\n-\t */\n-\tchar **argv = new char *[(gtestFlags.size() + 2)];\n-\tif (!argv)\n-\t\treturn -ENOMEM;\n-\n-\targv[0] = arg0;\n-\targc++;\n+\targv.push_back(arg0);\n \n-\tif (options.isSet(OptList)) {\n-\t\targv[argc] = const_cast(gtestFlags.at(\"list\").c_str());\n-\t\targc++;\n-\t}\n+\tif (options.isSet(OptList))\n+\t\targv.push_back(\"--gtest_list_tests\");\n \n \tif (options.isSet(OptFilter)) {\n \t\t/*\n \t\t * The filter flag needs to be passed as a single parameter, in\n \t\t * the format --gtest_filter=filterStr\n \t\t */\n-\t\tfilterParam = gtestFlags.at(\"filter\") + \"=\" +\n-\t\t\t static_cast(options[OptFilter]);\n-\n-\t\targv[argc] = const_cast(filterParam.c_str());\n-\t\targc++;\n+\t\tfilterParam = \"--gtest_filter=\" + options[OptFilter].toString();\n+\t\targv.push_back(filterParam.c_str());\n \t}\n \n-\targv[argc] = nullptr;\n-\n-\t::testing::InitGoogleTest(&argc, argv);\n+\targv.push_back(nullptr);\n \n-\tdelete[] argv;\n+\tint argc = argv.size();\n+\t::testing::InitGoogleTest(&argc, const_cast(argv.data()));\n \n \treturn 0;\n }\n","prefixes":["RFC","v2","10/16"]}