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

Commit 01ef52e1 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Gerrit Code Review
Browse files

Merge "fs_mgr: turn on -Werror"

parents d3d8703c 86e3f22b

fs_mgr/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -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)

fs_mgr/fs_mgr_fstab.c

+0 −2
Original line number Diff line number Diff line
@@ -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];

fs_mgr/fs_mgr_verity.c

+0 −1
Original line number Diff line number Diff line
@@ -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;