Browse Source

libfdt: fdt_get_string(): Fix comparison warnings

With -Wsign-compare, compilers warn about a mismatching signedness in
comparisons in fdt_get_string().

In the first two cases, we have just established that the signed values
are not negative, so it's safe to cast the values to an unsigned type.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Message-Id: <20200921165303.9115-7-andre.przywara@arm.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
main
Simon Glass 4 years ago committed by David Gibson
parent
commit
54dca09853
  1. 4
      libfdt/fdt_ro.c

4
libfdt/fdt_ro.c

@ -53,7 +53,7 @@ const char *fdt_get_string(const void *fdt, int stroffset, int *lenp)


err = -FDT_ERR_BADOFFSET; err = -FDT_ERR_BADOFFSET;
absoffset = stroffset + fdt_off_dt_strings(fdt); absoffset = stroffset + fdt_off_dt_strings(fdt);
if (absoffset >= totalsize) if (absoffset >= (unsigned)totalsize)
goto fail; goto fail;
len = totalsize - absoffset; len = totalsize - absoffset;


@ -61,7 +61,7 @@ const char *fdt_get_string(const void *fdt, int stroffset, int *lenp)
if (stroffset < 0) if (stroffset < 0)
goto fail; goto fail;
if (can_assume(LATEST) || fdt_version(fdt) >= 17) { if (can_assume(LATEST) || fdt_version(fdt) >= 17) {
if (stroffset >= fdt_size_dt_strings(fdt)) if ((unsigned)stroffset >= fdt_size_dt_strings(fdt))
goto fail; goto fail;
if ((fdt_size_dt_strings(fdt) - stroffset) < len) if ((fdt_size_dt_strings(fdt) - stroffset) < len)
len = fdt_size_dt_strings(fdt) - stroffset; len = fdt_size_dt_strings(fdt) - stroffset;

Loading…
Cancel
Save