summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJia Xianhua <jiaxianhua@gmail.com>2022-09-15 16:47:03 +0800
committerDavid Gibson <david@gibson.dropbear.id.au>2022-09-16 19:02:06 +1000
commitc6e92108bcd9c13ebbbcab44a49fa5f39c21621e (patch)
treef5dfc4baea742a5f333b93b71840a3b2cc07cdc9
parente37c25677dc946a025002a394172788b3169b3ce (diff)
downloaddevice-tree-compiler-c6e92108bcd9c13ebbbcab44a49fa5f39c21621e.tar.gz
libdtc: remove duplicate judgments
There is no need to check the VALID_DTB repeatedly, and can be combined into one if statement. Signed-off-by: Jia Xianhua <jiaxianhua@gmail.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
-rw-r--r--libfdt/fdt.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libfdt/fdt.c b/libfdt/fdt.c
index 9fe7cf4..90a39e8 100644
--- a/libfdt/fdt.c
+++ b/libfdt/fdt.c
@@ -106,7 +106,6 @@ int fdt_check_header(const void *fdt)
}
hdrsize = fdt_header_size(fdt);
if (!can_assume(VALID_DTB)) {
-
if ((fdt_totalsize(fdt) < hdrsize)
|| (fdt_totalsize(fdt) > INT_MAX))
return -FDT_ERR_TRUNCATED;
@@ -115,9 +114,7 @@ int fdt_check_header(const void *fdt)
if (!check_off_(hdrsize, fdt_totalsize(fdt),
fdt_off_mem_rsvmap(fdt)))
return -FDT_ERR_TRUNCATED;
- }
- if (!can_assume(VALID_DTB)) {
/* Bounds check structure block */
if (!can_assume(LATEST) && fdt_version(fdt) < 17) {
if (!check_off_(hdrsize, fdt_totalsize(fdt),