summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorYifan Hong <elsk@google.com>2018-12-17 23:29:06 +0100
committerYifan Hong <elsk@google.com>2018-12-19 00:57:29 +0100
commitd81b8e3d775743dbc2ce49b805cbce6fcc0ea617 (patch)
tree8e2c7ab494310eb77777e756b6a76940e2e28572 /recovery.cpp
parentMove parts of roots.cpp to libfs_mgr (diff)
downloadandroid_bootable_recovery-d81b8e3d775743dbc2ce49b805cbce6fcc0ea617.tar
android_bootable_recovery-d81b8e3d775743dbc2ce49b805cbce6fcc0ea617.tar.gz
android_bootable_recovery-d81b8e3d775743dbc2ce49b805cbce6fcc0ea617.tar.bz2
android_bootable_recovery-d81b8e3d775743dbc2ce49b805cbce6fcc0ea617.tar.lz
android_bootable_recovery-d81b8e3d775743dbc2ce49b805cbce6fcc0ea617.tar.xz
android_bootable_recovery-d81b8e3d775743dbc2ce49b805cbce6fcc0ea617.tar.zst
android_bootable_recovery-d81b8e3d775743dbc2ce49b805cbce6fcc0ea617.zip
Diffstat (limited to '')
-rw-r--r--recovery.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/recovery.cpp b/recovery.cpp
index 7e1fa43a6..a680615b1 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -294,7 +294,7 @@ bool SetUsbConfig(const std::string& state) {
// Returns the selected filename, or an empty string.
static std::string browse_directory(const std::string& path, Device* device) {
- ensure_path_mounted(path.c_str());
+ ensure_path_mounted(path);
std::unique_ptr<DIR, decltype(&closedir)> d(opendir(path.c_str()), closedir);
if (!d) {
@@ -572,7 +572,7 @@ static void choose_recovery_file(Device* device) {
log_file += "." + std::to_string(i);
}
- if (ensure_path_mounted(log_file.c_str()) == 0 && access(log_file.c_str(), R_OK) == 0) {
+ if (ensure_path_mounted(log_file) == 0 && access(log_file.c_str(), R_OK) == 0) {
entries.push_back(std::move(log_file));
}
};
@@ -836,7 +836,7 @@ static Device::BuiltinAction prompt_and_wait(Device* device, int status) {
}
case Device::MOUNT_SYSTEM:
// the system partition is mounted at /mnt/system
- if (ensure_path_mounted_at(get_system_root().c_str(), "/mnt/system") != -1) {
+ if (ensure_path_mounted_at(get_system_root(), "/mnt/system") != -1) {
ui->Print("Mounted /system.\n");
}
break;