ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix sign-compare warnings"

Browse source 
am: 567c45e10e

Change-Id: I92cdd8ce4991cb3897a6a0a732c9e4d9aef2b0b9
This commit is contained in:
Yi Kong 2018-12-16 16:56:59 -08:00 • committed by android-build-merger
commit 9fff2fbe7b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs_mgr/fs_mgr.cpp
View file

@ -615,7 +615,7 @@ static bool fs_match(const std::string& in1, const std::string& in2) {
// 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;

2
fs_mgr/fs_mgr_fstab.cpp
View file

@ -154,7 +154,7 @@ static int encryption_mode_to_flag(const struct flag_list* list, const char* mod
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) {