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

Commit 72be6d5e authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Gerrit Code Review
Browse files

Merge "cpio: Turn on -Werror"

parents 08c372d1 5ce75751

cpio/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ LOCAL_SRC_FILES := \ 


LOCAL_MODULE := mkbootfs



LOCAL_CFLAGS := -Werror



include $(BUILD_HOST_EXECUTABLE)



$(call dist-for-goals,dist_files,$(LOCAL_BUILT_MODULE))

cpio/mkbootfs.c

+3 −2
Original line number Diff line number Diff line
@@ -78,8 +78,9 @@ static void fix_stat(const char *path, struct stat *s) 
        s->st_mode = empty_path_config->mode | (s->st_mode & ~07777);

    } else {

        // Use the compiled-in fs_config() function.



        fs_config(path, S_ISDIR(s->st_mode), &s->st_uid, &s->st_gid, &s->st_mode, &capabilities);

        unsigned st_mode = s->st_mode;

        fs_config(path, S_ISDIR(s->st_mode), &s->st_uid, &s->st_gid, &st_mode, &capabilities);

        s->st_mode = (typeof(s->st_mode)) st_mode;

    }

}