diff options
author | Yifan Hong <elsk@google.com> | 2018-12-19 23:19:52 +0100 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-12-19 23:19:52 +0100 |
commit | 82fc6ae5b8d118cfa5db0fa8a39625305af7f4ea (patch) | |
tree | 76db008013c3391d38836ec3b09fd8d5449e5cb9 /roots.h | |
parent | Merge "Add verification before downloading whole package" (diff) | |
parent | roots.cpp: convert to C++ Fstab (diff) | |
download | android_bootable_recovery-82fc6ae5b8d118cfa5db0fa8a39625305af7f4ea.tar android_bootable_recovery-82fc6ae5b8d118cfa5db0fa8a39625305af7f4ea.tar.gz android_bootable_recovery-82fc6ae5b8d118cfa5db0fa8a39625305af7f4ea.tar.bz2 android_bootable_recovery-82fc6ae5b8d118cfa5db0fa8a39625305af7f4ea.tar.lz android_bootable_recovery-82fc6ae5b8d118cfa5db0fa8a39625305af7f4ea.tar.xz android_bootable_recovery-82fc6ae5b8d118cfa5db0fa8a39625305af7f4ea.tar.zst android_bootable_recovery-82fc6ae5b8d118cfa5db0fa8a39625305af7f4ea.zip |
Diffstat (limited to 'roots.h')
-rw-r--r-- | roots.h | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -19,7 +19,7 @@ #include <string> -typedef struct fstab_rec Volume; +typedef struct FstabEntry Volume; // Load and parse volume data from /etc/recovery.fstab. void load_volume_table(); @@ -29,25 +29,25 @@ Volume* volume_for_mount_point(const std::string& mount_point); // Make sure that the volume 'path' is on is mounted. Returns 0 on // success (volume is mounted). -int ensure_path_mounted(const char* path); +int ensure_path_mounted(const std::string& path); // Similar to ensure_path_mounted, but allows one to specify the mount_point. -int ensure_path_mounted_at(const char* path, const char* mount_point); +int ensure_path_mounted_at(const std::string& path, const std::string& mount_point); // Make sure that the volume 'path' is on is unmounted. Returns 0 on // success (volume is unmounted); -int ensure_path_unmounted(const char* path); +int ensure_path_unmounted(const std::string& path); // Reformat the given volume (must be the mount point only, eg // "/cache"), no paths permitted. Attempts to unmount the volume if // it is mounted. -int format_volume(const char* volume); +int format_volume(const std::string& volume); // Reformat the given volume (must be the mount point only, eg // "/cache"), no paths permitted. Attempts to unmount the volume if // it is mounted. // Copies 'directory' to root of the newly formatted volume -int format_volume(const char* volume, const char* directory); +int format_volume(const std::string& volume, const std::string& directory); // Ensure that all and only the volumes that packages expect to find // mounted (/tmp and /cache) are mounted. Returns 0 on success. |