{"id":2811,"url":"https://patchwork.libcamera.org/api/1.1/patches/2811/?format=json","web_url":"https://patchwork.libcamera.org/patch/2811/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200213130908.23638-4-kieran.bingham@ideasonboard.com>","date":"2020-02-13T13:09:08","name":"[libcamera-devel,3/3] libcamera: ipa_manager: Use utils::split()","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"4a212ced6b5545df8cce064c50ba8733b0cfecdf","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/1.1/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2811/mbox/","series":[{"id":670,"url":"https://patchwork.libcamera.org/api/1.1/series/670/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=670","date":"2020-02-13T13:09:05","name":"utils: Provide string splitting","version":1,"mbox":"https://patchwork.libcamera.org/series/670/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2811/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2811/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B1B7B61958\n\tfor ;\n\tThu, 13 Feb 2020 14:09:13 +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 4AD449D3;\n\tThu, 13 Feb 2020 14:09:13 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1581599353;\n\tbh=LELX5un+q4zi/OHCFaQBuUGHJuUBLMW5GcBiSKuVIRU=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=mVzA+ljyTgAJ6Io25zYZuAWqlv+dTYXGdOBn6sZUCeEGANcDoUCCqFTQ0OF4bWpqt\n\tPzjeSvLKAsqnjsH/LkjjZC1xdP8tEC71fIXoSzf9xtWIDnbbCjWOltTpsqtJEIRq6O\n\tA+1lbahjDmB2ckqrJ5l1Cb4W9JQrKCBnHPq3YUFA=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Thu, 13 Feb 2020 13:09:08 +0000","Message-Id":"<20200213130908.23638-4-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20200213130908.23638-1-kieran.bingham@ideasonboard.com>","References":"<20200213130908.23638-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 3/3] libcamera: ipa_manager: Use\n\tutils::split()","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":"Thu, 13 Feb 2020 13:09:13 -0000"},"content":"From: Laurent Pinchart \n\nReplace the custom string splitting implementation with utils::split().\n\nSigned-off-by: Laurent Pinchart \n[Kieran: Re-fit to master branch]\nSigned-off-by: Kieran Bingham \n---\n src/libcamera/ipa_manager.cpp | 21 ++++++---------------\n 1 file changed, 6 insertions(+), 15 deletions(-)","diff":"diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\nindex 92adc6c45015..4ffbdd712ac2 100644\n--- a/src/libcamera/ipa_manager.cpp\n+++ b/src/libcamera/ipa_manager.cpp\n@@ -110,22 +110,13 @@ IPAManager::IPAManager()\n \t\treturn;\n \t}\n \n-\tconst char *paths = modulePaths;\n-\twhile (1) {\n-\t\tconst char *delim = strchrnul(paths, ':');\n-\t\tsize_t count = delim - paths;\n-\n-\t\tif (count) {\n-\t\t\tstd::string path(paths, count);\n-\t\t\tret = addDir(path.c_str());\n-\t\t\tif (ret > 0)\n-\t\t\t\tipaCount += ret;\n-\t\t}\n-\n-\t\tif (*delim == '\\0')\n-\t\t\tbreak;\n+\tfor (const auto &dir : utils::split(modulePaths, \":\")) {\n+\t\tif (dir.empty())\n+\t\t\tcontinue;\n \n-\t\tpaths += count + 1;\n+\t\tint ret = addDir(dir.c_str());\n+\t\tif (ret > 0)\n+\t\t\tipaCount += ret;\n \t}\n \n \tif (!ipaCount)\n","prefixes":["libcamera-devel","3/3"]}