Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9e1d100 authored by Yi Kong's avatar Yi Kong Committed by android-build-merger
Browse files

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

am: 9fff2fbe

Change-Id: I5922d3779bef7ba390da29784883a4553944d56a
parents 1297a544 9fff2fbe

fs_mgr/fs_mgr.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

fs_mgr/fs_mgr_fstab.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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) {