len0rd/dtc
1
0
Fork 0
mirror of https://github.com/dgibson/dtc.git synced 2025-12-09 13:15:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

libfdt: Abolish encoding of error codes into pointers

Browse source 
This patch abolishes the non-standard and confusing encoding of errors
into pointer return values.  The only functions still returning such a
potentially encoded pointer are fdt_get_property() and fdt_getprop().
Those functions also return a length via an (int *).  With this patch
those functions instead now return NULL on any error, and return the
code indicating the type of error in the length paramater.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson 2006-12-15 15:12:49 +11:00
parent 73d60926a0
commit a7ee95ded6
10 changed files with 79 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

16
tests/del_property.c
View file

@ -34,7 +34,7 @@ int main(int argc, char *argv[])
void *fdt;
uint32_t *intp;
char *strp;
int err;
int err, lenerr;
int oldsize, delsize, newsize;
test_init(argc, argv);
@ -49,11 +49,10 @@ int main(int argc, char *argv[])
if (err)
FAIL("Failed to delete \"prop-int\": %s", fdt_strerror(err));
intp = fdt_getprop(fdt, 0, "prop-int", NULL);
err = fdt_ptr_error(intp);
if (! err)
intp = fdt_getprop(fdt, 0, "prop-int", &lenerr);
if (intp)
FAIL("prop-int still present after deletion");
if (err != FDT_ERR_NOTFOUND)
if ((err = fdt_ptrlen_error(intp, lenerr)) != FDT_ERR_NOTFOUND)
FAIL("Unexpected error on second getprop: %s", fdt_strerror(err));
strp = check_getprop(fdt, 0, "prop-str", strlen(TEST_STRING_1)+1,
@ -63,11 +62,10 @@ int main(int argc, char *argv[])
if (err)
FAIL("Failed to delete \"prop-str\": %s", fdt_strerror(err));
strp = fdt_getprop(fdt, 0, "prop-str", NULL);
err = fdt_ptr_error(strp);
if (! err)
strp = fdt_getprop(fdt, 0, "prop-str", &lenerr);
if (strp)
FAIL("prop-str still present after deletion");
if (err != FDT_ERR_NOTFOUND)
if ((err = fdt_ptrlen_error(strp, lenerr)) != FDT_ERR_NOTFOUND)
FAIL("Unexpected error on second getprop: %s", fdt_strerror(err));
delsize = fdt_totalsize(fdt);