diff options
author | Tao Bao <tbao@google.com> | 2017-10-02 19:55:13 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-02 19:55:13 +0200 |
commit | 0fa08924c6c3c434c18f9c396d066aeb1adfc1cb (patch) | |
tree | e6f96585d05ec9196dce0a0cf46b42427c78b2c1 | |
parent | Merge "otafault: Move to soong." (diff) | |
parent | Merge "roots: Remove #include "common.h"." (diff) | |
download | android_bootable_recovery-0fa08924c6c3c434c18f9c396d066aeb1adfc1cb.tar android_bootable_recovery-0fa08924c6c3c434c18f9c396d066aeb1adfc1cb.tar.gz android_bootable_recovery-0fa08924c6c3c434c18f9c396d066aeb1adfc1cb.tar.bz2 android_bootable_recovery-0fa08924c6c3c434c18f9c396d066aeb1adfc1cb.tar.lz android_bootable_recovery-0fa08924c6c3c434c18f9c396d066aeb1adfc1cb.tar.xz android_bootable_recovery-0fa08924c6c3c434c18f9c396d066aeb1adfc1cb.tar.zst android_bootable_recovery-0fa08924c6c3c434c18f9c396d066aeb1adfc1cb.zip |
-rw-r--r-- | roots.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -20,6 +20,7 @@ #include <fcntl.h> #include <stdint.h> #include <stdlib.h> +#include <string.h> #include <sys/mount.h> #include <sys/stat.h> #include <sys/types.h> @@ -38,7 +39,6 @@ #include <ext4_utils/wipe.h> #include <fs_mgr.h> -#include "common.h" #include "mounts.h" static struct fstab* fstab = nullptr; @@ -77,7 +77,7 @@ Volume* volume_for_path(const char* path) { if (path == nullptr || path[0] == '\0') return nullptr; std::string str(path); while (true) { - Volume* result = fs_mgr_get_entry_for_mount_point(fstab, str.c_str()); + Volume* result = fs_mgr_get_entry_for_mount_point(fstab, str); if (result != nullptr || str == "/") { return result; } |