From ce21ef893f0a0b321c2e0a99ff8a1641d6c40625 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Thu, 29 Nov 2012 18:23:11 -0700 Subject: [PATCH] Fix warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit warning: variable ‘...’ set but not used warning: comparison between pointer and integer Change-Id: Ia0b6b4ffca61bfc94a118591578e1b0af55a703f Signed-off-by: Stephen Warren Reviewed-on: http://git-master/r/167565 Reviewed-by: Eric Brower Reviewed-by: Automatic_Commit_Validation_User --- data_layout.c | 10 ---------- set.c | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/data_layout.c b/data_layout.c index 158be621d6..2a2230ed46 100644 --- a/data_layout.c +++ b/data_layout.c @@ -374,8 +374,6 @@ write_bootloaders(build_image_context *context) u_int32_t pagesremaining; u_int32_t virtual_blk; u_int32_t pages_per_blk; - u_int32_t min_offset; - u_int32_t max_offset; u_int32_t bl_0_version; u_int32_t bl_used; u_int8_t *hash_buffer; @@ -481,9 +479,6 @@ write_bootloaders(build_image_context *context) /* Update the bad block table with relative * bad blocks. */ - min_offset = virtual_blk * context->block_size; - max_offset = min_offset + context->block_size; - if (virtual_blk == 0) { set_bl_data(context, bl_instance, @@ -736,8 +731,6 @@ find_new_bct_blk(build_image_context *context) int begin_update(build_image_context *context) { - u_int32_t pages_per_bct; - u_int32_t pages_per_blk; u_int32_t hash_size; u_int32_t reserved_size; u_int32_t reserved_offset; @@ -772,9 +765,6 @@ begin_update(build_image_context *context) g_bct_parse_interf->set_value(token_odm_data, context->odm_data, context->bct); - pages_per_bct = iceil_log2(context->bct_size, context->page_size_log2); - pages_per_blk = (1 << (context->block_size_log2 - - context->page_size_log2)); /* Initialize the bad block table field. */ g_bct_parse_interf->init_bad_block_table(context); /* Fill the reserved data w/the padding pattern. */ diff --git a/set.c b/set.c index 9f999d6fdd..d52b720877 100644 --- a/set.c +++ b/set.c @@ -192,7 +192,7 @@ int context_set_value(build_image_context *context, break; case token_pre_bct_pad_blocks: - if (context->bct_init != NULL) { + if (context->bct_init) { printf("Error: Too late to pre-BCT pad.\n"); return 1; }