libfdt: Fix fdt_strerror() bugs
This fixes several small bugs related to fdt_strerror().
- an entry is added to the error table for FDT_ERR_BADLAYOUT.
- Incorrect usage of fdt_strerror() in check_property() and
check_getprop() is corrected (they were passing a positive error code,
when fdt_strerror() expects a negative code).
- Add code to properly retreive an error code from
fdt_get_property() in check_property(). With that a check that the
length returned by fdt_get_property() matches that stored in the
retreived property.
Signed-off-by: David Gibson <[email protected]>
diff --git a/tests/testutils.c b/tests/testutils.c
index 9637415..c7b4b9e 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -72,14 +72,16 @@
int len, const void *val)
{
const struct fdt_property *prop;
+ int retlen;
uint32_t tag, nameoff, proplen;
const char *propname;
verbose_printf("Checking property \"%s\"...", name);
- prop = fdt_get_property(fdt, nodeoffset, name, NULL);
+ prop = fdt_get_property(fdt, nodeoffset, name, &retlen);
verbose_printf("pointer %p\n", prop);
if (! prop)
- FAIL("NULL retreiving \"%s\" pointer", name);
+ FAIL("Error retreiving \"%s\" pointer: %s", name,
+ fdt_strerror(retlen));
tag = fdt32_to_cpu(prop->tag);
nameoff = fdt32_to_cpu(prop->nameoff);
@@ -92,6 +94,10 @@
if (!propname || !streq(propname, name))
FAIL("Property name mismatch \"%s\" instead of \"%s\"",
propname, name);
+ if (proplen != retlen)
+ FAIL("Length retrieved for \"%s\" by fdt_get_property()"
+ " differs from stored length (%d != %d)",
+ name, retlen, proplen);
if (proplen != len)
FAIL("Size mismatch on property \"%s\": %d insead of %d",
name, proplen, len);
@@ -108,7 +114,7 @@
propval = fdt_getprop(fdt, nodeoffset, name, &proplen);
if (! propval)
- FAIL("fdt_getprop(\"%s\"): %s", name, fdt_strerror(-proplen));
+ FAIL("fdt_getprop(\"%s\"): %s", name, fdt_strerror(proplen));
if (proplen != len)
FAIL("Size mismatch on property \"%s\": %d insead of %d",
