d966f08fcd
With -Wsign-compare, compilers warn about a mismatching signedness in comparisons in various files in the tests/ directory. For about half of the cases we can simply change the signed variable to be of an unsigned type, because they will never need to store negative values (which is the best fix of the problem). In the remaining cases we can cast the signed variable to an unsigned type, provided we know for sure it is not negative. We see two different scenarios here: - We either just explicitly checked for this variable to be positive (if (rc < 0) FAIL();), or - We rely on a function returning only positive values in the "length" pointer if the function returned successfully: which we just checked. At two occassions we compare with a constant "-1" (even though the variable is unsigned), so we just change this to ~0U to create an unsigned comparison value. Since this is about the tests, let's also add explicit tests for those values really not being negative. This fixes "make tests" (but not "make check" yet), when compiled with -Wsign-compare. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Message-Id: <20210618172030.9684-2-andre.przywara@arm.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
84 lines
1.7 KiB
C
84 lines
1.7 KiB
C
// SPDX-License-Identifier: LGPL-2.1-or-later
|
|
/*
|
|
* libfdt - Flat Device Tree manipulation
|
|
* Tests that fdt_next_subnode() works as expected
|
|
*
|
|
* Copyright (C) 2013 Google, Inc
|
|
*
|
|
* Copyright (C) 2007 David Gibson, IBM Corporation.
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdint.h>
|
|
|
|
#include <libfdt.h>
|
|
|
|
#include "tests.h"
|
|
#include "testdata.h"
|
|
|
|
static void test_node(void *fdt, int parent_offset)
|
|
{
|
|
uint32_t properties;
|
|
const fdt32_t *prop;
|
|
int offset, property;
|
|
unsigned int count;
|
|
int len;
|
|
|
|
/*
|
|
* This property indicates the number of properties in our
|
|
* test node to expect
|
|
*/
|
|
prop = fdt_getprop(fdt, parent_offset, "test-properties", &len);
|
|
if (!prop || len != sizeof(fdt32_t)) {
|
|
FAIL("Missing/invalid test-properties property at '%s'",
|
|
fdt_get_name(fdt, parent_offset, NULL));
|
|
}
|
|
properties = fdt32_to_cpu(*prop);
|
|
|
|
count = 0;
|
|
offset = fdt_first_subnode(fdt, parent_offset);
|
|
if (offset < 0)
|
|
FAIL("Missing test node\n");
|
|
|
|
fdt_for_each_property_offset(property, fdt, offset)
|
|
count++;
|
|
|
|
if (count != properties) {
|
|
FAIL("Node '%s': Expected %d properties, got %d\n",
|
|
fdt_get_name(fdt, parent_offset, NULL), properties,
|
|
count);
|
|
}
|
|
}
|
|
|
|
static void check_fdt_next_subnode(void *fdt)
|
|
{
|
|
int offset;
|
|
int count = 0;
|
|
|
|
fdt_for_each_subnode(offset, fdt, 0) {
|
|
test_node(fdt, offset);
|
|
count++;
|
|
}
|
|
|
|
if (count != 2)
|
|
FAIL("Expected %d tests, got %d\n", 2, count);
|
|
}
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
void *fdt;
|
|
|
|
test_init(argc, argv);
|
|
if (argc != 2)
|
|
CONFIG("Usage: %s <dtb file>", argv[0]);
|
|
|
|
fdt = load_blob(argv[1]);
|
|
if (!fdt)
|
|
FAIL("No device tree available");
|
|
|
|
check_fdt_next_subnode(fdt);
|
|
|
|
PASS();
|
|
}
|