diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2008-05-30 11:34:18 +1000 |
|---|---|---|
| committer | Jon Loeliger <jdl@jdl.com> | 2008-06-02 15:18:48 -0500 |
| commit | 6aaee513ddcb9f1ee1a0c6294f129546c99d8b5c (patch) | |
| tree | 32a4975fdc7f9420517efc0501d422e6a0db0134 | |
| parent | fc6e6f8d916b0d52b59a1c2a66f280e7fb7a80f5 (diff) | |
| download | dtc-6aaee513ddcb9f1ee1a0c6294f129546c99d8b5c.tar.gz | |
dtc: Fix some printf() format warnings when compiling 64-bit
Currently, dtc generates a few gcc build warnings if built for a
64-bit target, due to the altered type of uint64_t and size_t. This
patch fixes the warnings (without generating new warnings for 32-bit).
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
| -rw-r--r-- | tests/dtbs_equal_ordered.c | 5 | ||||
| -rw-r--r-- | tests/references.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tests/dtbs_equal_ordered.c b/tests/dtbs_equal_ordered.c index 2847bbd..a0b42ae 100644 --- a/tests/dtbs_equal_ordered.c +++ b/tests/dtbs_equal_ordered.c @@ -49,7 +49,10 @@ void compare_mem_rsv(const void *fdt1, const void *fdt2) if ((addr1 != addr2) || (size1 != size2)) FAIL("Mismatch in reserve entry %d: " "(0x%llx, 0x%llx) != (0x%llx, 0x%llx)", i, - addr1, size1, addr2, size2); + (unsigned long long)addr1, + (unsigned long long)size1, + (unsigned long long)addr2, + (unsigned long long)size2); } } diff --git a/tests/references.c b/tests/references.c index affc1d7..e98d450 100644 --- a/tests/references.c +++ b/tests/references.c @@ -38,7 +38,7 @@ void check_ref(const void *fdt, int node, uint32_t checkref) if (!p) FAIL("fdt_getprop(%d, \"ref\"): %s", node, fdt_strerror(len)); if (len != sizeof(*p)) - FAIL("'ref' in node at %d has wrong size (%d instead of %d)", + FAIL("'ref' in node at %d has wrong size (%d instead of %zd)", node, len, sizeof(*p)); ref = fdt32_to_cpu(*p); if (ref != checkref) @@ -49,7 +49,7 @@ void check_ref(const void *fdt, int node, uint32_t checkref) if (!p) FAIL("fdt_getprop(%d, \"lref\"): %s", node, fdt_strerror(len)); if (len != sizeof(*p)) - FAIL("'lref' in node at %d has wrong size (%d instead of %d)", + FAIL("'lref' in node at %d has wrong size (%d instead of %zd)", node, len, sizeof(*p)); ref = fdt32_to_cpu(*p); if (ref != checkref) |