[libcamera-devel] [PATCH LIBCAMERA 1/4] libcamera: ipa_proxy: use utils::split()

Kaaira Gupta kgupta at es.iitr.ac.in
Tue Mar 17 18:31:42 CET 2020


Replace the manual string splitting with utils::split()

Signed-off-by: Kaaira Gupta <kgupta at es.iitr.ac.in>
---
 src/libcamera/ipa_proxy.cpp | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/libcamera/ipa_proxy.cpp b/src/libcamera/ipa_proxy.cpp
index 5a3d2f1..e04117c 100644
--- a/src/libcamera/ipa_proxy.cpp
+++ b/src/libcamera/ipa_proxy.cpp
@@ -83,23 +83,16 @@ std::string IPAProxy::resolvePath(const std::string &file) const
 
 	/* No exec target in install directory; check env variable. */
 	const char *execPaths = utils::secure_getenv("LIBCAMERA_IPA_PROXY_PATH");
-	while (execPaths) {
-		const char *delim = strchrnul(execPaths, ':');
-		size_t count = delim - execPaths;
-
-		if (count) {
-			std::string proxyPath(execPaths, count);
+	if (execPaths) {
+		for (const auto &dir : utils::split(execPaths, ":")){
+			if (dir.empty())
+				continue;
+			std::string proxyPath = dir;
 			proxyPath += proxyFile;
 			if (!access(proxyPath.c_str(), X_OK))
 				return proxyPath;
 		}
-
-		if (*delim == '\0')
-			break;
-
-		execPaths += count + 1;
 	}
-
 	return std::string();
 }
 
-- 
2.17.1



More information about the libcamera-devel mailing list