diff options
| author | Andre Przywara <andre.przywara@arm.com> | 2020-10-01 17:46:25 +0100 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2020-10-02 10:22:37 +1000 |
| commit | 3d7c6f44195a78dfa52b1b8c9efd7efd706b0dd9 (patch) | |
| tree | 094541e6bac6671a5367bb2fd790a6f34155d547 /libfdt | |
| parent | 10f682788c3023d319cdc14f59ffe9d91cb6d2fc (diff) | |
| download | device-tree-compiler-3d7c6f44195a78dfa52b1b8c9efd7efd706b0dd9.tar.gz | |
libfdt: fdt_add_string_(): Fix comparison warning
With -Wsign-compare, compilers warn about a mismatching signedness
in a comparison in fdt_add_string_().
Make all variables unsigned, and express the negative offset trick via
subtractions in the code.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Message-Id: <20201001164630.4980-2-andre.przywara@arm.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'libfdt')
| -rw-r--r-- | libfdt/fdt_sw.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libfdt/fdt_sw.c b/libfdt/fdt_sw.c index 8de18fd..354f466 100644 --- a/libfdt/fdt_sw.c +++ b/libfdt/fdt_sw.c @@ -250,18 +250,18 @@ int fdt_end_node(void *fdt) static int fdt_add_string_(void *fdt, const char *s) { char *strtab = (char *)fdt + fdt_totalsize(fdt); - int strtabsize = fdt_size_dt_strings(fdt); - int len = strlen(s) + 1; - int struct_top, offset; + unsigned int strtabsize = fdt_size_dt_strings(fdt); + unsigned int len = strlen(s) + 1; + unsigned int struct_top, offset; - offset = -strtabsize - len; + offset = strtabsize + len; struct_top = fdt_off_dt_struct(fdt) + fdt_size_dt_struct(fdt); - if (fdt_totalsize(fdt) + offset < struct_top) + if (fdt_totalsize(fdt) - offset < struct_top) return 0; /* no more room :( */ - memcpy(strtab + offset, s, len); + memcpy(strtab - offset, s, len); fdt_set_size_dt_strings(fdt, strtabsize + len); - return offset; + return -offset; } /* Must only be used to roll back in case of error */ |