diff options
author | Sandeep Patil <sspatil@google.com> | 2018-08-22 14:33:15 -0700 |
---|---|---|
committer | Sandeep Patil <sspatil@google.com> | 2018-08-22 14:33:15 -0700 |
commit | 750f73b76eff7e3baa2daa3aeff76ae803f26f13 (patch) | |
tree | 85a848ea62cb9f23d9a26ce42522ddf52cbadaa6 | |
parent | 688d332824996cc78e217a9afd960d121497b623 (diff) | |
download | extras-750f73b76eff7e3baa2daa3aeff76ae803f26f13.tar.gz |
Remove Wno-unused-variable from defaults and fix resulting warnings.
Bug: 113035007
Test: mmm -j system/extras
Change-Id: Id3fa08008b643002baa5f0be0961b36db35e25a9
Signed-off-by: Sandeep Patil <sspatil@google.com>
-rw-r--r-- | Android.bp | 1 | ||||
-rw-r--r-- | f2fs_utils/f2fs_sparseblock.c | 9 | ||||
-rw-r--r-- | libpagemap/pm_process.c | 2 |
3 files changed, 3 insertions, 9 deletions
@@ -5,7 +5,6 @@ cc_defaults { "-Werror", "-Wno-unused-parameter", "-Wno-unused-result", - "-Wno-unused-variable", ], clang_cflags: [ "-Wno-incompatible-pointer-types-discards-qualifiers", diff --git a/f2fs_utils/f2fs_sparseblock.c b/f2fs_utils/f2fs_sparseblock.c index c77b626c..0ec1f30c 100644 --- a/f2fs_utils/f2fs_sparseblock.c +++ b/f2fs_utils/f2fs_sparseblock.c @@ -215,7 +215,7 @@ static struct f2fs_checkpoint *validate_checkpoint(block_t cp_addr, unsigned long long *version, int fd) { unsigned char *cp_block_1, *cp_block_2; - struct f2fs_checkpoint *cp_block, *cp_ret; + struct f2fs_checkpoint *cp_block; uint64_t cp1_version = 0, cp2_version = 0; cp_block_1 = malloc(F2FS_BLKSIZE); @@ -261,15 +261,11 @@ invalid_cp1: int get_valid_checkpoint_info(int fd, struct f2fs_super_block *sb, struct f2fs_checkpoint **cp, struct f2fs_info *info) { - struct f2fs_checkpoint *cp_block; - struct f2fs_checkpoint *cp1, *cp2, *cur_cp; - int cur_cp_no; unsigned long blk_size; unsigned long long cp1_version = 0, cp2_version = 0; unsigned long long cp1_start_blk_no; unsigned long long cp2_start_blk_no; - u32 bmp_size; blk_size = 1U << le32_to_cpu(sb->log_blocksize); @@ -487,11 +483,10 @@ int f2fs_test_bit(unsigned int nr, const char *p) } int run_on_used_blocks(uint64_t startblock, struct f2fs_info *info, int (*func)(uint64_t pos, void *data), void *data) { - struct f2fs_sit_block sit_block_cache; struct f2fs_sit_entry * sit_entry; uint64_t sit_block_num_cur = 0, segnum = 0, block_offset; uint64_t block; - unsigned int used, found, started = 0, i; + unsigned int used, found, i; block = startblock; while (block < info->total_blocks) { diff --git a/libpagemap/pm_process.c b/libpagemap/pm_process.c index 3c5c3914..5d47e26c 100644 --- a/libpagemap/pm_process.c +++ b/libpagemap/pm_process.c @@ -181,7 +181,7 @@ int pm_process_workingset(pm_process_t *proc, pm_memusage_t ws, map_ws; char filename[MAX_FILENAME]; int fd; - int i, j; + int i; int error; if (!proc) |