{"id":22323,"url":"https://patchwork.libcamera.org/api/patches/22323/?format=json","web_url":"https://patchwork.libcamera.org/patch/22323/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20241215230206.11002-4-laurent.pinchart@ideasonboard.com>","date":"2024-12-15T23:02:01","name":"[RFC,3/8] libcamera: base: file: Fix string usage in class API","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"365dd5892b269816b0681a7943f6691d3940fd6a","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22323/mbox/","series":[{"id":4889,"url":"https://patchwork.libcamera.org/api/series/4889/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4889","date":"2024-12-15T23:01:58","name":"libcamera: Use std::string_view","version":1,"mbox":"https://patchwork.libcamera.org/series/4889/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22323/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22323/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 B6EA7C32F6\n\tfor ;\n\tSun, 15 Dec 2024 23:02:33 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AF06E67F37;\n\tMon, 16 Dec 2024 00:02:30 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C4B8567F27\n\tfor ;\n\tMon, 16 Dec 2024 00:02:26 +0100 (CET)","from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 96E1A2C6;\n\tMon, 16 Dec 2024 00:01:50 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"VkqNKq4o\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1734303710;\n\tbh=I6tt0xIyGyxaF9ry/0EGE4JJlwugKl+FhWvr+mPUC2k=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=VkqNKq4o6k/hGNH1sqt2z5a7h/VGFIL0x25lJZgK0yzcOOJ6pJWL75bxhmUnXl3Ku\n\tzSSrv2F6IIJaDyArQdma5gUK+aiWXb8843om1QqfsdeFTmGiRi5yaTzNYYHT0Vvyzw\n\tbHJMUdDGz3CD5v3Hxzb1ClX8J3cg/+VJ3b6GXXSs=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Cc":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","Subject":"[RFC PATCH 3/8] libcamera: base: file: Fix string usage in class API","Date":"Mon, 16 Dec 2024 01:02:01 +0200","Message-ID":"<20241215230206.11002-4-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.45.2","In-Reply-To":"<20241215230206.11002-1-laurent.pinchart@ideasonboard.com>","References":"<20241215230206.11002-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","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":"Follow the string usage guidelines documented in the libcamera coding\nstyle in the File class API. The rationale is explained in the\nguidelines.\n\nSigned-off-by: Laurent Pinchart \n---\n include/libcamera/base/file.h | 6 +++---\n src/libcamera/base/file.cpp | 14 +++++++-------\n src/libcamera/sysfs.cpp | 2 +-\n test/camera/camera_reconfigure.cpp | 2 +-\n test/hotplug-cameras.cpp | 3 ++-\n 5 files changed, 14 insertions(+), 13 deletions(-)","diff":"diff --git a/include/libcamera/base/file.h b/include/libcamera/base/file.h\nindex 6d3f106d5900f7a7..dc2841d92c8f3573 100644\n--- a/include/libcamera/base/file.h\n+++ b/include/libcamera/base/file.h\n@@ -40,12 +40,12 @@ public:\n \n \tusing OpenMode = Flags;\n \n-\tFile(const std::string &name);\n+\tFile(std::string name);\n \tFile();\n \t~File();\n \n \tconst std::string &fileName() const { return name_; }\n-\tvoid setFileName(const std::string &name);\n+\tvoid setFileName(std::string name);\n \tbool exists() const;\n \n \tbool open(OpenMode mode);\n@@ -66,7 +66,7 @@ public:\n \t\t\t MapFlags flags = MapFlag::NoOption);\n \tbool unmap(uint8_t *addr);\n \n-\tstatic bool exists(const std::string &name);\n+\tstatic bool exists(const char *name);\n \n private:\n \tLIBCAMERA_DISABLE_COPY(File)\ndiff --git a/src/libcamera/base/file.cpp b/src/libcamera/base/file.cpp\nindex 2b83a51775b04661..5cff82064101bc2b 100644\n--- a/src/libcamera/base/file.cpp\n+++ b/src/libcamera/base/file.cpp\n@@ -83,8 +83,8 @@ LOG_DEFINE_CATEGORY(File)\n * Upon construction the File object is closed and shall be opened with open()\n * before performing I/O operations.\n */\n-File::File(const std::string &name)\n-\t: name_(name), mode_(OpenModeFlag::NotOpen), error_(0)\n+File::File(std::string name)\n+\t: name_(std::move(name)), mode_(OpenModeFlag::NotOpen), error_(0)\n {\n }\n \n@@ -126,7 +126,7 @@ File::~File()\n *\n * Any memory mapping associated with the File is unmapped.\n */\n-void File::setFileName(const std::string &name)\n+void File::setFileName(std::string name)\n {\n \tif (isOpen()) {\n \t\tLOG(File, Error)\n@@ -136,7 +136,7 @@ void File::setFileName(const std::string &name)\n \n \tunmapAll();\n \n-\tname_ = name;\n+\tname_ = std::move(name);\n }\n \n /**\n@@ -151,7 +151,7 @@ void File::setFileName(const std::string &name)\n */\n bool File::exists() const\n {\n-\treturn exists(name_);\n+\treturn exists(name_.c_str());\n }\n \n /**\n@@ -464,10 +464,10 @@ void File::unmapAll()\n * \\param[in] name The file name\n * \\return True if the file exists, false otherwise\n */\n-bool File::exists(const std::string &name)\n+bool File::exists(const char *name)\n {\n \tstruct stat st;\n-\tint ret = stat(name.c_str(), &st);\n+\tint ret = stat(name, &st);\n \tif (ret < 0)\n \t\treturn false;\n \ndiff --git a/src/libcamera/sysfs.cpp b/src/libcamera/sysfs.cpp\nindex 3d9885b080c6f911..cbde72d86fd62b41 100644\n--- a/src/libcamera/sysfs.cpp\n+++ b/src/libcamera/sysfs.cpp\n@@ -92,7 +92,7 @@ std::string firmwareNodePath(const std::string &device)\n \n \t/* Lookup for ACPI-based systems */\n \tnode = device + \"/firmware_node/path\";\n-\tif (File::exists(node)) {\n+\tif (File::exists(node.c_str())) {\n \t\tstd::ifstream file(node);\n \t\tif (!file.is_open())\n \t\t\treturn {};\ndiff --git a/test/camera/camera_reconfigure.cpp b/test/camera/camera_reconfigure.cpp\nindex 06c87730a1305952..51bd1bf3493d9a86 100644\n--- a/test/camera/camera_reconfigure.cpp\n+++ b/test/camera/camera_reconfigure.cpp\n@@ -179,7 +179,7 @@ private:\n \t\t\t\tcontinue;\n \n \t\t\tstring pname(\"/proc/\" + string(ptr->d_name) + \"/comm\");\n-\t\t\tif (File::exists(pname)) {\n+\t\t\tif (File::exists(pname.c_str())) {\n \t\t\t\tifstream pfile(pname.c_str());\n \t\t\t\tstring comm;\n \t\t\t\tgetline(pfile, comm);\ndiff --git a/test/hotplug-cameras.cpp b/test/hotplug-cameras.cpp\nindex 530e9a31120970de..37652c9941e75bb5 100644\n--- a/test/hotplug-cameras.cpp\n+++ b/test/hotplug-cameras.cpp\n@@ -73,7 +73,8 @@ protected:\n \t\tdir = opendir(uvcDriverDir_.c_str());\n \t\t/* Find a UVC device directory, which we can bind/unbind. */\n \t\twhile ((dirent = readdir(dir)) != nullptr) {\n-\t\t\tif (!File::exists(uvcDriverDir_ + dirent->d_name + \"/video4linux\"))\n+\t\t\tstd::string fileName = uvcDriverDir_ + dirent->d_name + \"/video4linux\";\n+\t\t\tif (!File::exists(fileName.c_str()))\n \t\t\t\tcontinue;\n \n \t\t\tuvcDeviceDir = dirent->d_name;\n","prefixes":["RFC","3/8"]}