diff options
| author | Bowgo Tsai <bowgotsai@google.com> | 2017-09-29 13:13:37 +0800 |
|---|---|---|
| committer | Bowgo Tsai <bowgotsai@google.com> | 2017-10-10 18:17:29 +0800 |
| commit | d837f837ad30198589c8311ed8595f59527ee9f8 (patch) | |
| tree | f6ae5b8230281e182ec4e0efbe0875c2d1436c1b /fs_mgr/include_fstab | |
| parent | 16e31801a5c2ed1df3960089e3aca3ce06b6c9a2 (diff) | |
| download | core-d837f837ad30198589c8311ed8595f59527ee9f8.tar.gz core-d837f837ad30198589c8311ed8595f59527ee9f8.tar.bz2 core-d837f837ad30198589c8311ed8595f59527ee9f8.zip | |
fs_mgr: removing __BEGIN_DECLS and __END_DECLS
fs_mgr isn't usable by C now as we've migrated all fs_mgr clients in AOSP
to CPP. Removing the support for C clients.
Bug: 67024518
Bug: 67444051
Test: boot sailfish
Change-Id: Iac57f51eb6a524c6dcdc625c83af75602b4f9b3b
Diffstat (limited to 'fs_mgr/include_fstab')
| -rw-r--r-- | fs_mgr/include_fstab/fstab/fstab.h | 14 |
1 files changed, 1 insertions, 13 deletions
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 */ |