diff options
Diffstat (limited to 'fs_mgr')
| -rw-r--r-- | fs_mgr/include/fs_mgr.h | 4 | ||||
| -rw-r--r-- | fs_mgr/include_fstab/fstab/fstab.h | 14 |
2 files changed, 1 insertions, 17 deletions
diff --git a/fs_mgr/include/fs_mgr.h b/fs_mgr/include/fs_mgr.h index 3d3faf325..5c26c2ebe 100644 --- a/fs_mgr/include/fs_mgr.h +++ b/fs_mgr/include/fs_mgr.h @@ -31,8 +31,6 @@ // turn verity off in userdebug builds. #define VERITY_METADATA_MAGIC_DISABLE 0x46464f56 // "VOFF" -__BEGIN_DECLS - // Verity modes enum verity_mode { VERITY_MODE_EIO = 0, @@ -85,6 +83,4 @@ int fs_mgr_do_format(struct fstab_rec *fstab, bool reserve_footer); #define FS_MGR_SETUP_VERITY_SUCCESS 0 int fs_mgr_setup_verity(struct fstab_rec *fstab, bool wait_for_verity_dev); -__END_DECLS - #endif /* __CORE_FS_MGR_H */ diff --git a/fs_mgr/include_fstab/fstab/fstab.h b/fs_mgr/include_fstab/fstab/fstab.h index ef5172444..bc2942d0c 100644 --- a/fs_mgr/include_fstab/fstab/fstab.h +++ b/fs_mgr/include_fstab/fstab/fstab.h @@ -22,13 +22,7 @@ #include <stdint.h> #include <stdio.h> -// C++ only headers -// TODO: move this into separate header files under include/fs_mgr/*.h -#ifdef __cplusplus #include <string> -#endif - -__BEGIN_DECLS /* * The entries must be kept in the same order as they were seen in the fstab. @@ -70,6 +64,7 @@ void fs_mgr_free_fstab(struct fstab* fstab); int fs_mgr_add_entry(struct fstab* fstab, const char* mount_point, const char* fs_type, const char* blk_device); +struct fstab_rec* fs_mgr_get_entry_for_mount_point(struct fstab* fstab, const std::string& path); int fs_mgr_is_voldmanaged(const struct fstab_rec* fstab); int fs_mgr_is_nonremovable(const struct fstab_rec* fstab); int fs_mgr_is_verified(const struct fstab_rec* fstab); @@ -88,13 +83,6 @@ int fs_mgr_is_nofail(const struct fstab_rec* fstab); int fs_mgr_is_latemount(const struct fstab_rec* fstab); int fs_mgr_is_quota(const struct fstab_rec* fstab); -__END_DECLS - -// C++ only functions -// TODO: move this into separate header files under include/fs_mgr/*.h -#ifdef __cplusplus std::string fs_mgr_get_slot_suffix(); -struct fstab_rec* fs_mgr_get_entry_for_mount_point(struct fstab* fstab, const std::string& path); -#endif #endif /* __CORE_FS_TAB_H */ |