PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: ipa_manager: Simplify addDir() usage

Browse Source 
The addDir call only returns an error if it can't open the directory.
Callers only care about the number of modules added, and discard any
error information.

Simplify the return value and calling code by returning an unsigned int
of the number of modules loaded.

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Kieran Bingham
2020-02-21 11:55:49 +00:00
parent 7860977710
commit 80d70e4fcf
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcamera/include/ipa_manager.h
View File

@@ -32,7 +32,7 @@ private:
IPAManager();
~IPAManager();
int addDir(const char *libDir);
unsigned int addDir(const char *libDir);
};
} /* namespace libcamera */

16
src/libcamera/ipa_manager.cpp
View File

@@ -96,7 +96,6 @@ LOG_DEFINE_CATEGORY(IPAManager)
IPAManager::IPAManager()
{
unsigned int ipaCount = 0;
int ret;
/* User-specified paths take precedence. */
const char *modulePaths = utils::secure_getenv("LIBCAMERA_IPA_MODULE_PATH");
@@ -105,9 +104,7 @@ IPAManager::IPAManager()
if (dir.empty())
continue;
int ret = addDir(dir.c_str());
if (ret > 0)
ipaCount += ret;
ipaCount += addDir(dir.c_str());
}
if (!ipaCount)
@@ -116,9 +113,7 @@ IPAManager::IPAManager()
}
/* Load IPAs from the installed system path. */
ret = addDir(IPA_MODULE_DIR);
if (ret > 0)
ipaCount += ret;
ipaCount += addDir(IPA_MODULE_DIR);
if (!ipaCount)
LOG(IPAManager, Warning)
@@ -153,17 +148,16 @@ IPAManager *IPAManager::instance()
* This method tries to create an IPAModule instance for every shared object
* found in \a libDir, and skips invalid IPA modules.
*
* \return Number of modules loaded by this call, or a negative error code
* otherwise
* \return Number of modules loaded by this call
*/
int IPAManager::addDir(const char *libDir)
unsigned int IPAManager::addDir(const char *libDir)
{
struct dirent *ent;
DIR *dir;
dir = opendir(libDir);
if (!dir)
return -errno;
return 0;
std::vector<std::string> paths;
while ((ent = readdir(dir)) != nullptr) {