9521dc5ecc
In a number of places through libfdt and its tests, we have *_typed() macro variants on functions which use gcc's typeof and statement expression extensions to allow passing literals where the underlying function takes a buffer and size. These seemed like a good idea at the time, but in fact they have some problems. They use typeof and statement expressions, extensions I'd prefer to avoid for portability. Plus, they have potential gotchas - although they'll deal with the size of the thing passed, they won't deal with other representation issues (like endianness) and results could be very strange if the type of the expression passed isn't what you think it is. In fact, the only users of these _typed() macros were when the value passed is a single cell (32-bit integer). Therefore, this patch removes all these _typed() macros and replaces them with explicit _cell() variants which handle a single 32-bit integer, and which also perform endian convesions as appropriate. With this in place, it now becomes easy to use standardized big-endian representation for integer valued properties in the testcases, regardless of the platform we're running on. We therefore do that, which has the additional advantage that all the example trees created during a test run are now byte-for-byte identical regardless of platform. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
91 lines
2.5 KiB
C
91 lines
2.5 KiB
C
/*
|
|
* libfdt - Flat Device Tree manipulation
|
|
* Testcase for fdt_delprop()
|
|
* Copyright (C) 2006 David Gibson, IBM Corporation.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public License
|
|
* as published by the Free Software Foundation; either version 2.1 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <ctype.h>
|
|
#include <stdint.h>
|
|
|
|
#include <fdt.h>
|
|
#include <libfdt.h>
|
|
|
|
#include "tests.h"
|
|
#include "testdata.h"
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
void *fdt;
|
|
const uint32_t *intp;
|
|
const char *strp;
|
|
int err, lenerr;
|
|
int oldsize, delsize, newsize;
|
|
|
|
test_init(argc, argv);
|
|
fdt = load_blob_arg(argc, argv);
|
|
|
|
fdt = open_blob_rw(fdt);
|
|
|
|
oldsize = fdt_totalsize(fdt);
|
|
|
|
intp = check_getprop_cell(fdt, 0, "prop-int", TEST_VALUE_1);
|
|
verbose_printf("int value was 0x%08x\n", *intp);
|
|
|
|
err = fdt_delprop(fdt, 0, "prop-int");
|
|
if (err)
|
|
FAIL("Failed to delete \"prop-int\": %s", fdt_strerror(err));
|
|
|
|
intp = fdt_getprop(fdt, 0, "prop-int", &lenerr);
|
|
if (intp)
|
|
FAIL("prop-int still present after deletion");
|
|
if (lenerr != -FDT_ERR_NOTFOUND)
|
|
FAIL("Unexpected error on second getprop: %s",
|
|
fdt_strerror(lenerr));
|
|
|
|
strp = check_getprop(fdt, 0, "prop-str", strlen(TEST_STRING_1)+1,
|
|
TEST_STRING_1);
|
|
verbose_printf("string value was \"%s\"\n", strp);
|
|
err = fdt_delprop(fdt, 0, "prop-str");
|
|
if (err)
|
|
FAIL("Failed to delete \"prop-str\": %s", fdt_strerror(err));
|
|
|
|
strp = fdt_getprop(fdt, 0, "prop-str", &lenerr);
|
|
if (strp)
|
|
FAIL("prop-str still present after deletion");
|
|
if (lenerr != -FDT_ERR_NOTFOUND)
|
|
FAIL("Unexpected error on second getprop: %s",
|
|
fdt_strerror(lenerr));
|
|
|
|
delsize = fdt_totalsize(fdt);
|
|
|
|
err = fdt_pack(fdt);
|
|
if (err)
|
|
FAIL("fdt_pack(): %s\n", fdt_strerror(err));
|
|
|
|
newsize = fdt_totalsize(fdt);
|
|
|
|
verbose_printf("oldsize = %d, delsize = %d, newsize = %d\n",
|
|
oldsize, delsize, newsize);
|
|
|
|
if (newsize >= oldsize)
|
|
FAIL("Tree failed to shrink after deletions");
|
|
|
|
PASS();
|
|
}
|