commit b592dd8afff487e5ba73bbd782cfa7501a65e88e
author Tom Cherry <tomcherry@google.com> Wed Aug 02 17:01:36 2017 -0700
committer Tom Cherry <tomcherry@google.com> Mon Aug 14 10:27:33 2017 -0700
tree 22dde0feaeec6d370a71fe8d324d4b59f5c6f6b0
parent 7fa62c58d603dc1bc56d73a22bbf7f9a0dd3059e

init: use Result<T> for the parsing functions

Test: boot bullhead
Change-Id: I7f00c5f0f54dd4fe05df73e1d6a89b56d788e113

init/ueventd.cpp

diff --git a/init/ueventd.cpp b/init/ueventd.cpp
index b71945a..1435d82 100644
--- a/init/ueventd.cpp
+++ b/init/ueventd.cpp
@@ -223,10 +223,10 @@
     using namespace std::placeholders;
     std::vector<SysfsPermissions> sysfs_permissions;
     std::vector<Permissions> dev_permissions;
-    parser.AddSingleLineParser(
-        "/sys/", std::bind(ParsePermissionsLine, _1, _2, &sysfs_permissions, nullptr));
+    parser.AddSingleLineParser("/sys/",
+                               std::bind(ParsePermissionsLine, _1, &sysfs_permissions, nullptr));
     parser.AddSingleLineParser("/dev/",
-                               std::bind(ParsePermissionsLine, _1, _2, nullptr, &dev_permissions));
+                               std::bind(ParsePermissionsLine, _1, nullptr, &dev_permissions));
 
     parser.ParseConfig("/ueventd.rc");
     parser.ParseConfig("/vendor/ueventd.rc");