Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/66901 )
Change subject: dummyflasher.c: Retype appropriate variables and attributes with bool ......................................................................
dummyflasher.c: Retype appropriate variables and attributes with bool
Use the bool type instead of an integer for appropriate variables and attributes, since this represents their purpose much better.
Signed-off-by: Felix Singer felixsinger@posteo.net Change-Id: I712b1ef7e1ad74d3e004dcf36c82898c88072c63 Reviewed-on: https://review.coreboot.org/c/flashrom/+/66901 Reviewed-by: Anastasia Klimchuk aklm@chromium.org Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com --- M dummyflasher.c 1 file changed, 29 insertions(+), 11 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved
diff --git a/dummyflasher.c b/dummyflasher.c index 07fcd72..49a541b 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -15,6 +15,7 @@
#include <assert.h> #include <string.h> +#include <stdbool.h> #include <stdlib.h> #include <stdio.h> #include <ctype.h> @@ -48,8 +49,8 @@ * WRSR code on enabling WRSR_EXT2 for more chips. */ bool emu_wrsr_ext2; bool emu_wrsr_ext3; - int erase_to_zero; - int emu_modified; /* is the image modified since reading it? */ + bool erase_to_zero; + bool emu_modified; /* is the image modified since reading it? */ uint8_t emu_status[3]; uint8_t emu_status_len; /* number of emulated status registers */ /* If "freq" parameter is passed in from command line, commands will delay @@ -183,7 +184,7 @@ struct emu_data *emu_data = flash->mst->opaque.data;
memcpy(emu_data->flashchip_contents + start, buf, len); - emu_data->emu_modified = 1; + emu_data->emu_modified = true;
return 0; } @@ -193,7 +194,7 @@ struct emu_data *emu_data = flash->mst->opaque.data;
memset(emu_data->flashchip_contents + blockaddr, emu_data->erase_to_zero ? 0x00 : 0xff, blocklen); - emu_data->emu_modified = 1; + emu_data->emu_modified = true;
return 0; } @@ -361,7 +362,7 @@ }
memcpy(data->flashchip_contents + start, buf, len); - data->emu_modified = 1; + data->emu_modified = true; return 0; }
@@ -375,7 +376,7 @@
/* FIXME: Maybe use ERASED_VALUE(flash) instead of 0xff ? */ memset(data->flashchip_contents + start, 0xff, len); - data->emu_modified = 1; + data->emu_modified = true; return 0; }
@@ -1090,20 +1091,20 @@ }
if ((units > tmp) && (units < end)) { - int units_valid = 0; + bool units_valid = false;
if (units < end - 3) { ; } else if (units == end - 2) { if (!strcasecmp(units, "hz")) - units_valid = 1; + units_valid = true; } else if (units == end - 3) { if (!strcasecmp(units, "khz")) { freq *= 1000; - units_valid = 1; + units_valid = true; } else if (!strcasecmp(units, "mhz")) { freq *= 1000000; - units_valid = 1; + units_valid = true; } }
@@ -1284,7 +1285,7 @@ } if (!strcmp(tmp, "yes")) { msg_pdbg("Emulated chip will erase to 0x00\n"); - data->erase_to_zero = 1; + data->erase_to_zero = true; } else if (!strcmp(tmp, "no")) { msg_pdbg("Emulated chip will erase to 0xff\n"); } else {