diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-05-08 20:36:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-08 20:36:33 +0000 |
| commit | af0df46d74368bb98edaadb3c09ddbc7252d3110 (patch) | |
| tree | 4934a2f719ae1ece93f72caf41a3a021afe9f37e /fs_mgr | |
| parent | 95d616c2c7c87a7c34c57461cf8445a2b1e8ec70 (diff) | |
| parent | e6246ca6cc48e182cc5e193510b05f8889ba9aed (diff) | |
| download | core-af0df46d74368bb98edaadb3c09ddbc7252d3110.tar.gz core-af0df46d74368bb98edaadb3c09ddbc7252d3110.tar.bz2 core-af0df46d74368bb98edaadb3c09ddbc7252d3110.zip | |
am e6246ca6: am 01ef52e1: Merge "fs_mgr: turn on -Werror"
* commit 'e6246ca6cc48e182cc5e193510b05f8889ba9aed':
fs_mgr: turn on -Werror
Diffstat (limited to 'fs_mgr')
| -rw-r--r-- | fs_mgr/Android.mk | 3 | ||||
| -rw-r--r-- | fs_mgr/fs_mgr_fstab.c | 2 | ||||
| -rw-r--r-- | fs_mgr/fs_mgr_verity.c | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fs_mgr/Android.mk b/fs_mgr/Android.mk index 165ebd490..7cffc37a5 100644 --- a/fs_mgr/Android.mk +++ b/fs_mgr/Android.mk @@ -11,6 +11,7 @@ LOCAL_MODULE:= libfs_mgr LOCAL_STATIC_LIBRARIES := liblogwrap libmincrypt libext4_utils_static LOCAL_C_INCLUDES += system/extras/ext4_utils LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include +LOCAL_CFLAGS := -Werror include $(BUILD_STATIC_LIBRARY) @@ -31,5 +32,7 @@ LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_UNSTRIPPED) LOCAL_STATIC_LIBRARIES := libfs_mgr liblogwrap libcutils liblog libc libmincrypt libext4_utils_static +LOCAL_CFLAGS := -Werror + include $(BUILD_EXECUTABLE) diff --git a/fs_mgr/fs_mgr_fstab.c b/fs_mgr/fs_mgr_fstab.c index 45bbfdc37..f86fc6a98 100644 --- a/fs_mgr/fs_mgr_fstab.c +++ b/fs_mgr/fs_mgr_fstab.c @@ -162,7 +162,6 @@ static int parse_flags(char *flags, struct flag_list *fl, p = strtok_r(NULL, ",", &savep); } -out: if (fs_options && fs_options[0]) { /* remove the last trailing comma from the list of options */ fs_options[strlen(fs_options) - 1] = '\0'; @@ -181,7 +180,6 @@ struct fstab *fs_mgr_read_fstab(const char *fstab_path) const char *delim = " \t"; char *save_ptr, *p; struct fstab *fstab = NULL; - struct fstab_rec *recs; struct fs_mgr_flag_values flag_vals; #define FS_OPTIONS_LEN 1024 char tmp_fs_options[FS_OPTIONS_LEN]; diff --git a/fs_mgr/fs_mgr_verity.c b/fs_mgr/fs_mgr_verity.c index 40bc2ecde..c9a2a9bc7 100644 --- a/fs_mgr/fs_mgr_verity.c +++ b/fs_mgr/fs_mgr_verity.c @@ -85,7 +85,6 @@ static RSAPublicKey *load_key(char *path) static int verify_table(char *signature, char *table, int table_length) { - int fd; RSAPublicKey *key; uint8_t hash_buf[SHA_DIGEST_SIZE]; int retval = -1; |