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

Commit 835526fd authored by Sasha Levitskiy's avatar Sasha Levitskiy Committed by Gerrit Code Review
Browse files

Merge "Cleanup: warning fixit."

parents 2f365509 cdc1cfb3

fs_mgr/fs_mgr_fstab.c

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ void fs_mgr_free_fstab(struct fstab *fstab) 
/* Add an entry to the fstab, and return 0 on success or -1 on error */

int fs_mgr_add_entry(struct fstab *fstab,

                     const char *mount_point, const char *fs_type,

                     const char *blk_device, long long length)

                     const char *blk_device)

{

    struct fstab_rec *new_fstab_recs;

    int n = fstab->num_entries;

fs_mgr/fs_mgr_main.c

+4 −4
Original line number Diff line number Diff line
@@ -80,10 +80,10 @@ int main(int argc, char *argv[]) 
    int a_flag=0;

    int u_flag=0;

    int n_flag=0;

    char *n_name;

    char *n_blk_dev;

    char *fstab_file;

    struct fstab *fstab;

    char *n_name=NULL;

    char *n_blk_dev=NULL;

    char *fstab_file=NULL;

    struct fstab *fstab=NULL;



    klog_init();

    klog_set_level(6);

fs_mgr/include/fs_mgr.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ int fs_mgr_get_crypt_info(struct fstab *fstab, char *key_loc, 
                          char *real_blk_device, int size);

int fs_mgr_add_entry(struct fstab *fstab,

                     const char *mount_point, const char *fs_type,

                     const char *blk_device, long long length);

                     const char *blk_device);

struct fstab_rec *fs_mgr_get_entry_for_mount_point(struct fstab *fstab, const char *path);

int fs_mgr_is_voldmanaged(struct fstab_rec *fstab);

int fs_mgr_is_nonremovable(struct fstab_rec *fstab);

healthd/healthd_board_default.cpp

+2 −2
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 


#include <healthd.h>



void healthd_board_init(struct healthd_config *config)

void healthd_board_init(struct healthd_config*)

{

    // use defaults

}





int healthd_board_battery_update(struct android::BatteryProperties *props)

int healthd_board_battery_update(struct android::BatteryProperties*)

{

    // return 0 to log periodic polled battery status to kernel log

    return 0;

libpixelflinger/codeflinger/disassem.c

+5 −10
Original line number Diff line number Diff line
@@ -301,19 +301,14 @@ static u_int disassemble_readword(u_int address); 
static void disassemble_printaddr(u_int address);



u_int

disasm(const disasm_interface_t *di, u_int loc, int altfmt)

disasm(const disasm_interface_t *di, u_int loc, int __unused altfmt)

{

	const struct arm32_insn *i_ptr = &arm32_i[0];



	u_int insn;

	int matchp;

	u_int insn = di->di_readword(loc);

	int matchp = 0;

	int branch;

	char* f_ptr;

	int fmt;



	fmt = 0;

	matchp = 0;

	insn = di->di_readword(loc);

	int fmt = 0;



/*	di->di_printf("loc=%08x insn=%08x : ", loc, insn);*/
@@ -670,7 +665,7 @@ disasm_insn_ldrhstrh(const disasm_interface_t *di, u_int insn, u_int loc) 
}



static void

disasm_insn_ldcstc(const disasm_interface_t *di, u_int insn, u_int loc)

disasm_insn_ldcstc(const disasm_interface_t *di, u_int insn, u_int __unused loc)

{

	if (((insn >> 8) & 0xf) == 1)

		di->di_printf("f%d, ", (insn >> 12) & 0x07);