From 2c25796aa0cbc11a4dac02045d494ca4429c7ca7 Mon Sep 17 00:00:00 2001
From: Tom Cherry <tomcherry@google.com>
Date: Fri, 30 Nov 2018 11:25:28 -0800
Subject: [PATCH] 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
---
 fs_mgr/fs_mgr_fstab.cpp            | 15 ++++++---------
 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;