Change in flashrom[master]: ich_descriptors_tool: Fix -Wsign-compare warnings

[Anastasia Klimchuk (Code Review)]

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/63488 )

Change subject: ich_descriptors_tool: Fix -Wsign-compare warnings
......................................................................

ich_descriptors_tool: Fix -Wsign-compare warnings

This patch is fixing -Wsign-compare warnings, specifically:

warning: comparison of integer expressions of different signedness:
 ‘int’ and ‘uint32_t’ {aka ‘unsigned int’} [-Wsign-compare]

Both instances in this patch produce the same warning.

The patch is needed to sync compiler warning options between meson
and makefile.

TEST=running the following gives no warnings:
meson setup --wipe (to clean build directory)
ninja test

Change-Id: I1f9325e9cf89f57f18d63cc3906a0958b47286d7
Signed-off-by: Anastasia Klimchuk <[e-mail]>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/63488
Tested-by: build bot (Jenkins) <[e-mail]>
Reviewed-by: Thomas Heijligen <[e-mail]>
Reviewed-by: Felix Singer <[e-mail]>
---
M util/ich_descriptors_tool/ich_descriptors_tool.c
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Felix Singer: Looks good to me, approved
  Thomas Heijligen: Looks good to me, approved



diff --git a/util/ich_descriptors_tool/ich_descriptors_tool.c b/util/ich_descriptors_tool/ich_descriptors_tool.c
index 4951206..a5a59ad 100644
--- a/util/ich_descriptors_tool/ich_descriptors_tool.c
+++ b/util/ich_descriptors_tool/ich_descriptors_tool.c
@@ -46,7 +46,6 @@
 static void dump_file(const char *prefix, const uint32_t *dump, unsigned int len,
 		      const struct ich_desc_region *const reg, unsigned int i)
 {
-	int ret;
 	char *fn;
 	const char *reg_name;
 	uint32_t file_len;
@@ -85,8 +84,8 @@
 	}
 	free(fn);
 
-	ret = write(fh, &dump[base >> 2], file_len);
-	if (ret != file_len) {
+	const ssize_t ret = write(fh, &dump[base >> 2], file_len);
+	if (ret < 0 || ((size_t) ret) != file_len) {
 		fprintf(stderr, "FAILED.\n");
 		exit(1);
 	}
@@ -270,7 +269,8 @@
 	prettyprint_ich_descriptors(cs, &desc);
 
 	pMAC = (uint8_t *) &buf[ICH_FREG_BASE(desc.region.FLREGs[3]) >> 2];
-	if (len >= ICH_FREG_BASE(desc.region.FLREGs[3]) + 6 && pMAC[0] != 0xff)
+	/* The case len < 0 is handled above as error. At this point len is non-negative. */
+	if (((size_t) len) >= ICH_FREG_BASE(desc.region.FLREGs[3]) + 6 && pMAC[0] != 0xff)
 		printf("The MAC address might be at offset 0x%x: "
 		       "%02x:%02x:%02x:%02x:%02x:%02x\n",
 		       ICH_FREG_BASE(desc.region.FLREGs[3]),



3 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
-- 
To view, visit https://review.coreboot.org/c/flashrom/+/63488
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I1f9325e9cf89f57f18d63cc3906a0958b47286d7
Gerrit-Change-Number: 63488
Gerrit-PatchSet: 7
Gerrit-Owner: Anastasia Klimchuk <[e-mail]>
Gerrit-Reviewer: Anastasia Klimchuk <[e-mail]>
Gerrit-Reviewer: Felix Singer <[e-mail]>
Gerrit-Reviewer: Subrata Banik <[e-mail]>
Gerrit-Reviewer: Thomas Heijligen <[e-mail]>
Gerrit-Reviewer: build bot (Jenkins) <[e-mail]>
Gerrit-CC: Angel Pons <[e-mail]>
Gerrit-CC: Nico Huber <[e-mail]>
Gerrit-CC: Paul Menzel <[e-mail]>
Gerrit-CC: Peter Marheine <[e-mail]>
Gerrit-MessageType: merged