Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d837f837 authored by Bowgo Tsai's avatar Bowgo Tsai
Browse files

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
parent 16e31801

fs_mgr/include/fs_mgr.h

+0 −4
Original line number Diff line number Diff line
@@ -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 */

fs_mgr/include_fstab/fstab/fstab.h

+1 −13
Original line number Diff line number Diff line
@@ -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 */