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

Commit e93040c6 authored by Yi Kong's avatar Yi Kong
Browse files

Fix sign-compare warnings 

system/core/fs_mgr/fs_mgr_fstab.cpp:161:18: error: comparison of integers of different signs: 'int' and 'const uint64_t' (aka 'const unsigned long') [-Werror,-Wsign-compare]
        if (flag == j->flag) {
            ~~~~ ^  ~~~~~~~

system/core/fs_mgr/fs_mgr.cpp:674:11: error: comparison of integers of different signs: 'int' and 'std::__1::vector<FstabEntry, std::__1::allocator<FstabEntry> >::size_type' (aka 'unsigned long') [-Werror,-Wsign-compare]
    if (i < fstab.size()) --i;
        ~ ^ ~~~~~~~~~~~~

Test: m checkbuild
Change-Id: I056add222a92f99134a49ac141bd143ddd54179b
parent 00289c9c

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) {