From 519be66fc59558971dd653afe69ccaf1a633b492 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Sun, 23 Dec 2018 20:03:35 +0100 Subject: Fix -Wsign-compare trouble Mostly by changing to `unsigned` types where applicable, sometimes `signed` types, and casting as a last resort. Change-Id: I08895543ffb7a48058bcf91ef6500ca113f2d305 Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/c/flashrom/+/30409 Tested-by: build bot (Jenkins) Reviewed-by: Jacob Garber --- at45db.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'at45db.c') diff --git a/at45db.c b/at45db.c index 38c06858..5f949bb2 100644 --- a/at45db.c +++ b/at45db.c @@ -463,9 +463,9 @@ static int at45db_fill_buffer1(struct flashctx *flash, const uint8_t *bytes, uns } /* Create a suitable buffer to store opcode, address and data chunks for buffer1. */ - const int max_data_write = flash->mst->spi.max_data_write - 4; - const unsigned int max_chunk = (max_data_write > 0 && max_data_write <= page_size) ? - max_data_write : page_size; + const unsigned int max_data_write = flash->mst->spi.max_data_write; + const unsigned int max_chunk = max_data_write > 4 && max_data_write - 4 <= page_size ? + max_data_write - 4 : page_size; uint8_t buf[4 + max_chunk]; buf[0] = AT45DB_BUFFER1_WRITE; -- cgit v1.2.1