diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-05-23 17:42:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-23 17:42:36 +0000 |
| commit | 72be6d5eea001e7bd1bc7b31e8c7e81a0c4a9cff (patch) | |
| tree | 9f034f9cb43a026fb18ae2ee20d0143d913f4081 | |
| parent | 08c372d18ecfc02cf7cba7ef65007118b78762bd (diff) | |
| parent | 5ce757518b8ce43849b6cfa1faac41ce6cb14894 (diff) | |
| download | system_core-72be6d5eea001e7bd1bc7b31e8c7e81a0c4a9cff.zip system_core-72be6d5eea001e7bd1bc7b31e8c7e81a0c4a9cff.tar.gz system_core-72be6d5eea001e7bd1bc7b31e8c7e81a0c4a9cff.tar.bz2 | |
Merge "cpio: Turn on -Werror"
| -rw-r--r-- | cpio/Android.mk | 2 | ||||
| -rw-r--r-- | cpio/mkbootfs.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/cpio/Android.mk b/cpio/Android.mk index 5184463..575beb2 100644 --- a/cpio/Android.mk +++ b/cpio/Android.mk @@ -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)) diff --git a/cpio/mkbootfs.c b/cpio/mkbootfs.c index 7d3740c..7175749 100644 --- a/cpio/mkbootfs.c +++ b/cpio/mkbootfs.c @@ -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; } } |