Patch Detail
Show a patch.
GET /api/patches/2869/?format=api
{ "id": 2869, "url": "https://patchwork.libcamera.org/api/patches/2869/?format=api", "web_url": "https://patchwork.libcamera.org/patch/2869/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20200221163130.4791-4-kieran.bingham@ideasonboard.com>", "date": "2020-02-21T16:31:27", "name": "[libcamera-devel,v4,3/6] libcamera: ipa_manager: Simplify addDir() usage", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "85eb7ddaf88395c219553512e5f8a7f6d30b61ea", "submitter": { "id": 4, "url": "https://patchwork.libcamera.org/api/people/4/?format=api", "name": "Kieran Bingham", "email": "kieran.bingham@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/2869/mbox/", "series": [ { "id": 689, "url": "https://patchwork.libcamera.org/api/series/689/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=689", "date": "2020-02-21T16:31:24", "name": "Support loading IPAs from the build tree", "version": 4, "mbox": "https://patchwork.libcamera.org/series/689/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/2869/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/2869/checks/", "tags": {}, "headers": { "Return-Path": "<kieran.bingham@ideasonboard.com>", "Received": [ "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 A79EE6262D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 21 Feb 2020 17:31:35 +0100 (CET)", "from localhost.localdomain\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4635E563;\n\tFri, 21 Feb 2020 17:31:35 +0100 (CET)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1582302695;\n\tbh=pVUnLAeSR4c2y/LqcBY+eCCiMfX6Fn7svc8KfzAGo1Y=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=kCR5PH18Cb1AjzxFP/HZxhIjbBG35dssvHTxdRGisDeJrT2jszGTdj0q7RHNON/8z\n\tbhE7w54sTcBX/U8QiNtoAihBNHuNK+lbltegEohd7TYbEDhWP2JBDw1M59y63gQqn9\n\t1eHLuQM3QGiuO0Sc36FJScvgTXBxEe84R/65P0AM=", "From": "Kieran Bingham <kieran.bingham@ideasonboard.com>", "To": "libcamera devel <libcamera-devel@lists.libcamera.org>", "Date": "Fri, 21 Feb 2020 16:31:27 +0000", "Message-Id": "<20200221163130.4791-4-kieran.bingham@ideasonboard.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200221163130.4791-1-kieran.bingham@ideasonboard.com>", "References": "<20200221163130.4791-1-kieran.bingham@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v4 3/6] libcamera: ipa_manager: Simplify\n\taddDir() usage", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "X-List-Received-Date": "Fri, 21 Feb 2020 16:31:35 -0000" }, "content": "The addDir call only returns an error if it can't open the directory.\nCallers only care about the number of modules added, and discard any\nerror information.\n\nSimplify the return value and calling code by returning an unsigned int\nof the number of modules loaded.\n\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\n src/libcamera/include/ipa_manager.h | 2 +-\n src/libcamera/ipa_manager.cpp | 16 +++++-----------\n 2 files changed, 6 insertions(+), 12 deletions(-)", "diff": "diff --git a/src/libcamera/include/ipa_manager.h b/src/libcamera/include/ipa_manager.h\nindex 126f8babbc8f..f13a93d74498 100644\n--- a/src/libcamera/include/ipa_manager.h\n+++ b/src/libcamera/include/ipa_manager.h\n@@ -32,7 +32,7 @@ private:\n \tIPAManager();\n \t~IPAManager();\n \n-\tint addDir(const char *libDir);\n+\tunsigned int addDir(const char *libDir);\n };\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\nindex 7f0a5d58749b..90dd30030dcb 100644\n--- a/src/libcamera/ipa_manager.cpp\n+++ b/src/libcamera/ipa_manager.cpp\n@@ -96,7 +96,6 @@ LOG_DEFINE_CATEGORY(IPAManager)\n IPAManager::IPAManager()\n {\n \tunsigned int ipaCount = 0;\n-\tint ret;\n \n \t/* User-specified paths take precedence. */\n \tconst char *modulePaths = utils::secure_getenv(\"LIBCAMERA_IPA_MODULE_PATH\");\n@@ -105,9 +104,7 @@ IPAManager::IPAManager()\n \t\t\tif (dir.empty())\n \t\t\t\tcontinue;\n \n-\t\t\tint ret = addDir(dir.c_str());\n-\t\t\tif (ret > 0)\n-\t\t\t\tipaCount += ret;\n+\t\t\tipaCount += addDir(dir.c_str());\n \t\t}\n \n \t\tif (!ipaCount)\n@@ -116,9 +113,7 @@ IPAManager::IPAManager()\n \t}\n \n \t/* Load IPAs from the installed system path. */\n-\tret = addDir(IPA_MODULE_DIR);\n-\tif (ret > 0)\n-\t\tipaCount += ret;\n+\tipaCount += addDir(IPA_MODULE_DIR);\n \n \tif (!ipaCount)\n \t\tLOG(IPAManager, Warning)\n@@ -153,17 +148,16 @@ IPAManager *IPAManager::instance()\n * This method tries to create an IPAModule instance for every shared object\n * found in \\a libDir, and skips invalid IPA modules.\n *\n- * \\return Number of modules loaded by this call, or a negative error code\n- * otherwise\n+ * \\return Number of modules loaded by this call\n */\n-int IPAManager::addDir(const char *libDir)\n+unsigned int IPAManager::addDir(const char *libDir)\n {\n \tstruct dirent *ent;\n \tDIR *dir;\n \n \tdir = opendir(libDir);\n \tif (!dir)\n-\t\treturn -errno;\n+\t\treturn 0;\n \n \tstd::vector<std::string> paths;\n \twhile ((ent = readdir(dir)) != nullptr) {\n", "prefixes": [ "libcamera-devel", "v4", "3/6" ] }