Fix mac build
Adding -Werror broke the mac build, which was passing an incorrect
pointer type:
external/squashfs-tools/squashfs-tools/android.c:52:49: error: incompatible pointer types passing 'mode_t *' (aka 'unsigned short *') to parameter of type 'unsigned int *' [-Werror,-Wincompatible-pointer-types]
fs_config_func takes unsigned int* for its uid, gid, and mode
parameters, but the stat structure contains architecture-specific
types. Pass pointer to local unsigned int values, and then save
them into the stat structure.
Test: builds on Linux
Change-Id: Ic83c144ffb9c59afe42ab1606d2710e76d19158d
diff --git a/squashfs-tools/android.c b/squashfs-tools/android.c
index eeef2aa..49d4dca 100644
--- a/squashfs-tools/android.c
+++ b/squashfs-tools/android.c
@@ -47,10 +47,14 @@
const char *target_out_path, uint64_t *capabilities) {
// filesystem_config does not preserve file type bits
mode_t stat_file_type_mask = stat->st_mode & S_IFMT;
+ unsigned int uid = 0, gid = 0, mode = 0;
if (fs_config_func)
fs_config_func(path, S_ISDIR(stat->st_mode), target_out_path,
- &stat->st_uid, &stat->st_gid, &stat->st_mode, capabilities);
+ &uid, &gid, &mode, capabilities);
stat->st_mode |= stat_file_type_mask;
+ stat->st_uid = uid;
+ stat->st_gid = gid;
+ stat->st_mode = mode;
}
