commit 4554070ec42355fa5616d1490866f54297f7a2b6
author Elliott Hughes <enh@google.com> Tue Mar 29 15:15:35 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 29 15:15:35 2016 +0000
tree 0cbee06c53e2a8c69501d0299bd315157901c9d3
parent 21f70a05c72fe6e131fdd6c82d0d92dad9f9f5cf
parent 90d9c33a7e4936602d8a281a47458297be0c6ae1

Merge "Add operator int() to unique_fd."

init/devices.cpp

diff --git a/init/devices.cpp b/init/devices.cpp
index 557a6ac..e74140b 100644
--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -413,7 +413,7 @@
 static char **get_character_device_symlinks(struct uevent *uevent)
 {
     const char *parent;
-    char *slash;
+    const char *slash;
     char **links;
     int link_num = 0;
     int width;
@@ -467,7 +467,7 @@
 {
     const char *device;
     struct platform_node *pdev;
-    char *slash;
+    const char *slash;
     const char *type;
     char buf[256];
     char link_path[256];

init/util.cpp

diff --git a/init/util.cpp b/init/util.cpp
index bddc3b2..4d36dfd 100644
--- a/init/util.cpp
+++ b/init/util.cpp
@@ -355,7 +355,7 @@
 {
     int ret;
     char buf[256];
-    char *slash;
+    const char *slash;
     int width;
 
     slash = strrchr(newpath, '/');