[libcamera-devel] [PATCH 3/3] libcamera: ipa_manager: Use utils::split()

[Kieran Bingham]

From: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

Replace the custom string splitting implementation with utils::split().

Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
[Kieran: Re-fit to master branch]
Signed-off-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
---
 src/libcamera/ipa_manager.cpp | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp
index 92adc6c45015..4ffbdd712ac2 100644
--- a/src/libcamera/ipa_manager.cpp
+++ b/src/libcamera/ipa_manager.cpp
@@ -110,22 +110,13 @@ IPAManager::IPAManager()
 		return;
 	}
 
-	const char *paths = modulePaths;
-	while (1) {
-		const char *delim = strchrnul(paths, ':');
-		size_t count = delim - paths;
-
-		if (count) {
-			std::string path(paths, count);
-			ret = addDir(path.c_str());
-			if (ret > 0)
-				ipaCount += ret;
-		}
-
-		if (*delim == '\0')
-			break;
+	for (const auto &dir : utils::split(modulePaths, ":")) {
+		if (dir.empty())
+			continue;
 
-		paths += count + 1;
+		int ret = addDir(dir.c_str());
+		if (ret > 0)
+			ipaCount += ret;
 	}
 
 	if (!ipaCount)
-- 
2.20.1