summaryrefslogtreecommitdiffstats
path: root/fs_mgr/fs_mgr_fstab.cpp
diff options
context:
space:
mode:
authorTom Cherry <tomcherry@google.com>2018-11-30 11:25:28 -0800
committerTom Cherry <tomcherry@google.com>2018-11-30 11:29:46 -0800
commit2c25796aa0cbc11a4dac02045d494ca4429c7ca7 (patch)
treeef8eda7226d5f3fb45183bb65b7e6549bfbc8853 /fs_mgr/fs_mgr_fstab.cpp
parent9d24734b5c3b21895eb16e3f1144cca9a72d8514 (diff)
downloadsystem_core-2c25796aa0cbc11a4dac02045d494ca4429c7ca7.tar.gz
system_core-2c25796aa0cbc11a4dac02045d494ca4429c7ca7.tar.bz2
system_core-2c25796aa0cbc11a4dac02045d494ca4429c7ca7.zip
fs_mgr: fix typo from off64_t change.
I accidentally changed some _mode enums from unsigned int to off64_t along with the rest changes. They probably shouldn't have been unsigned anyway though, so let's make them plain 'int' while we fix the original typo. Test: boot Change-Id: I0c6c51a1a8170056b99087d249539eb79026cffe
Diffstat (limited to 'fs_mgr/fs_mgr_fstab.cpp')
-rw-r--r--fs_mgr/fs_mgr_fstab.cpp15
1 files changed, 6 insertions, 9 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) {