diff options
| author | Tom Cherry <tomcherry@google.com> | 2018-11-30 23:33:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-11-30 23:33:50 +0000 |
| commit | 7f5a2d3c8f1c0649f728fc8de6bf24456c25989c (patch) | |
| tree | 136d6aea7991e3ab5e9e80cfecaf223f9cc3bb1b | |
| parent | 4115c2caf6eb038c0acc727d64c7fb8c364e6cc2 (diff) | |
| parent | 2c25796aa0cbc11a4dac02045d494ca4429c7ca7 (diff) | |
| download | system_core-7f5a2d3c8f1c0649f728fc8de6bf24456c25989c.tar.gz system_core-7f5a2d3c8f1c0649f728fc8de6bf24456c25989c.tar.bz2 system_core-7f5a2d3c8f1c0649f728fc8de6bf24456c25989c.zip | |
Merge "fs_mgr: fix typo from off64_t change."
| -rw-r--r-- | fs_mgr/fs_mgr_fstab.cpp | 15 | ||||
| -rw-r--r-- | fs_mgr/include_fstab/fstab/fstab.h | 4 |
2 files changed, 8 insertions, 11 deletions
diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp index 410bf6b97..52eeb83f7 100644 --- a/fs_mgr/fs_mgr_fstab.cpp +++ b/fs_mgr/fs_mgr_fstab.cpp @@ -49,15 +49,15 @@ struct fs_mgr_flag_values { int max_comp_streams; off64_t zram_size; off64_t reserved_size; - unsigned int file_contents_mode; - unsigned int file_names_mode; + int file_contents_mode; + int file_names_mode; off64_t erase_blk_size; off64_t logical_blk_size; }; struct flag_list { const char *name; - unsigned int flag; + int flag; }; static struct flag_list mount_flags[] = { @@ -133,9 +133,8 @@ static const struct flag_list file_names_encryption_modes[] = { {0, 0}, }; -static unsigned int encryption_mode_to_flag(const struct flag_list *list, - const char *mode, const char *type) -{ +static int encryption_mode_to_flag(const struct flag_list* list, const char* mode, + const char* type) { const struct flag_list *j; for (j = list; j->name; ++j) { @@ -147,9 +146,7 @@ static unsigned int encryption_mode_to_flag(const struct flag_list *list, return 0; } -static const char *flag_to_encryption_mode(const struct flag_list *list, - unsigned int flag) -{ +static const char* flag_to_encryption_mode(const struct flag_list* list, int flag) { const struct flag_list *j; for (j = list; j->name; ++j) { diff --git a/fs_mgr/include_fstab/fstab/fstab.h b/fs_mgr/include_fstab/fstab/fstab.h index ca52a9834..da13899e0 100644 --- a/fs_mgr/include_fstab/fstab/fstab.h +++ b/fs_mgr/include_fstab/fstab/fstab.h @@ -54,8 +54,8 @@ struct fstab_rec { int max_comp_streams; off64_t zram_size; off64_t reserved_size; - off64_t file_contents_mode; - off64_t file_names_mode; + int file_contents_mode; + int file_names_mode; off64_t erase_blk_size; off64_t logical_blk_size; char* sysfs_path; |