commit 59557571d7265df6df5649746265f28ab71902a1
author Yi Kong <yikong@google.com> Sun Dec 16 16:56:59 2018 -0800
committer android-build-merger <android-build-merger@google.com> Sun Dec 16 16:56:59 2018 -0800
tree d0fbfcce7a32b17357aa759fea523bd7b73a1e4d
parent 49338b2856e072cb9ea42b0010f99d8aea5a0a47
parent 96749c422068038d30c0c5be1fc6fab8b645e021

Merge "Fix sign-compare warnings"
am: 567c45e10e

Change-Id: I92cdd8ce4991cb3897a6a0a732c9e4d9aef2b0b9

fs_mgr/fs_mgr.cpp

diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index 8757689..88f7a2c 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -615,7 +615,7 @@
 // Sets errno to match the 1st mount failure on failure.
 static bool mount_with_alternatives(const Fstab& fstab, int start_idx, int* end_idx,
                                     int* attempted_idx) {
-    int i;
+    unsigned long i;
     int mount_errno = 0;
     bool mounted = false;
 

fs_mgr/fs_mgr_fstab.cpp

diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
index bd9d675..e0891eb 100644
--- a/fs_mgr/fs_mgr_fstab.cpp
+++ b/fs_mgr/fs_mgr_fstab.cpp
@@ -154,7 +154,7 @@
     return 0;
 }
 
-static const char* flag_to_encryption_mode(const struct flag_list* list, int flag) {
+static const char* flag_to_encryption_mode(const struct flag_list* list, uint64_t flag) {
     const struct flag_list *j;
 
     for (j = list; j->name; ++j) {