[{"id":3835,"web_url":"https://patchwork.libcamera.org/comment/3835/","msgid":"<20200222102814.GC4846@pendragon.ideasonboard.com>","date":"2020-02-22T10:28:14","subject":"Re: [libcamera-devel] [PATCH v4 3/6] libcamera: ipa_manager:\n\tSimplify addDir() usage","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nThank you for the patch.\n\nOn Fri, Feb 21, 2020 at 04:31:27PM +0000, Kieran Bingham wrote:\n> The addDir call only returns an error if it can't open the directory.\n> Callers only care about the number of modules added, and discard any\n> error information.\n> \n> Simplify the return value and calling code by returning an unsigned int\n> of the number of modules loaded.\n> \n> Signed-off-by: Kieran Bingham \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/libcamera/include/ipa_manager.h | 2 +-\n> src/libcamera/ipa_manager.cpp | 16 +++++-----------\n> 2 files changed, 6 insertions(+), 12 deletions(-)\n> \n> diff --git a/src/libcamera/include/ipa_manager.h b/src/libcamera/include/ipa_manager.h\n> index 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 */\n> diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\n> index 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 paths;\n> \twhile ((ent = readdir(dir)) != nullptr) {","headers":{"Return-Path":"","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 3777760430\n\tfor ;\n\tSat, 22 Feb 2020 11:28:35 +0100 (CET)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B58C233E;\n\tSat, 22 Feb 2020 11:28:34 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1582367314;\n\tbh=sVLldpKFIaOuqwNaFlfXp3AiDFacaqojYK8ARqvgAN4=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=WoKtR/dCQnxyub1vtWkX7KNVU7E6NwcetvdLLwfl5WnoSJRwD8tRLlCx4Tvo7d/IH\n\tedlo/2NILq0X0qgxkJhqNggtxPkGlKBVOWlTNXUOG7+LOaiMOtpdXZz7g3oEeuyuO/\n\ttoWBrapBJpR/tXePKn+eaWMWQwsThMW/2RyblRyE=","Date":"Sat, 22 Feb 2020 12:28:14 +0200","From":"Laurent Pinchart ","To":"Kieran Bingham ","Cc":"libcamera devel ","Message-ID":"<20200222102814.GC4846@pendragon.ideasonboard.com>","References":"<20200221163130.4791-1-kieran.bingham@ideasonboard.com>\n\t<20200221163130.4791-4-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20200221163130.4791-4-kieran.bingham@ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH v4 3/6] libcamera: ipa_manager:\n\tSimplify addDir() usage","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","X-List-Received-Date":"Sat, 22 Feb 2020 10:28:35 -0000"}}]