diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-05-08 20:31:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-08 20:31:11 +0000 |
| commit | 01ef52e114d9ef59681f3b83f71545390611fde3 (patch) | |
| tree | 552ffeaf70451ede962c7aed36337fa56cb9ed34 | |
| parent | d3d8703c8acd8233653e6d33a9abe01b8b238336 (diff) | |
| parent | 86e3f22b6ae048ba8c9284b4900258c3ccd17cdf (diff) | |
| download | system_core-01ef52e114d9ef59681f3b83f71545390611fde3.zip system_core-01ef52e114d9ef59681f3b83f71545390611fde3.tar.gz system_core-01ef52e114d9ef59681f3b83f71545390611fde3.tar.bz2 | |
Merge "fs_mgr: turn on -Werror"
| -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 165ebd4..7cffc37 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 45bbfdc..f86fc6a 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 40bc2ec..c9a2a9b 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; |